update

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "一个用Nodejs作为框架编译C/C++的代码库，未来可能会支持更多语言",
   "main": "./src/index.ts",
-  "type": "commonjs",
+  "type": "module",
   "scripts": {
     "dev": "tsc && node ./build/index.js"
   },

src/Builder/CppBuilder.ts

@@ -1,31 +1,35 @@
 import path from "path";
-import CppProject from "../Project/CppProject";
+import CppProject from "../Project/CppProject.js";
-import { getGlobalProjects, getProjectsByTypeName } from "../Tools/Projects";
+import { getGlobalProjects, getProjectsByTypeName } from "../Tools/Projects.js";
-import Builder from "./Builder";
+import Builder from "./Builder.js";
-import { getBuildDir } from "../Tools/BuildDir";
+import { getBuildDir } from "../Tools/BuildDir.js";
 import fs from "fs"
-import printDebug from "../Tools/DebugPrint";
+import printDebug from "../Tools/DebugPrint.js";
-import sourceFilesToString from "../Tools/SourceFilesToString";
+import sourceFilesToString from "../Tools/SourceFilesToString.js";
-import execAsync from "../Tools/ExecAsync";
+import execAsync from "../Tools/ExecAsync.js";
 
 export default class CppBuilder implements Builder{
     compile = async ()=>{
+        printDebug("compiling")
         const cppProjects  = getProjectsByTypeName("cpp") as CppProject[]
-        const tasks = []
+        const tasks = cppProjects.map((e)=>{
-        cppProjects.forEach((e)=>{
             printDebug(`making dir ${path.join(getBuildDir(),e.name)}`)
             fs.mkdirSync(path.join(getBuildDir(),e.name),{recursive:true})
             const command  = `${e.compiler.compilerPath} -o ${path.join(getBuildDir(),e.name,`${e.name}.o`)} ${e.optimizeToBuildString()} ${sourceFilesToString(e)}`
             printDebug(command)
-            tasks.push(execAsync(command).then(({stdout,stderr})=>{
+            // tasks.push()
-                
+            return execAsync(command)
-            }))
+        });
+        (await Promise.all(tasks)).forEach(e=>{
+            printDebug(`stdout:${e.stdout}`)
+            printDebug(`stderr:${e.stderr}`)
         })
     }
     link = async()=>{
 
     }
     build = async () =>{
-        
+        printDebug("building")
+        await this.compile()
     }
 }

src/Compiler/GppCompiler.ts

@@ -1,7 +1,7 @@
-import getExecutablePathsFromEnv from "../Tools/GetExecutablePathsFromEnv";
+import getExecutablePathsFromEnv from "../Tools/GetExecutablePathsFromEnv.js";
-import protectPath from "../Tools/ProtectPath";
+import protectPath from "../Tools/ProtectPath.js";
-import tryGetCompilerVersion from "../Tools/TryGetCompilerVersion";
+import tryGetCompilerVersion from "../Tools/TryGetCompilerVersion.js";
-import Compiler from "./Compiler";
+import Compiler from "./Compiler.js";
 
 export default class GppCompiler implements Compiler{
     compilerPath: string;

src/Project/CppProject.ts

@@ -1,16 +1,16 @@
 import path from "path";
-import GppCompiler from "../Compiler/GppCompiler";
+import GppCompiler from "../Compiler/GppCompiler.js";
-import printDebug from "../Tools/DebugPrint";
+import printDebug from "../Tools/DebugPrint.js";
-import setGetDefaultCompiler from "../Tools/SetGetDefaultCompiler";
+import setGetDefaultCompiler from "../Tools/SetGetDefaultCompiler.js";
-import HaveCompiler from "./interface/HaveCompiler";
+import HaveCompiler from "./interface/HaveCompiler.js";
-import Optimize from "./interface/Optimize";
+import Optimize from "./interface/Optimize.js";
-import SourceFiles from "./interface/SourceFiles";
+import SourceFiles from "./interface/SourceFiles.js";
-import Project from "./Project";
+import Project from "./Project.js";
-import { getNmakePath } from "../Tools/NmakePath";
+import { getNmakePath } from "../Tools/NmakePath.js";
-import { getNmakeDir } from "../Tools/NmakeDir";
+import { getNmakeDir } from "../Tools/NmakeDir.js";
-import { getBuildDir } from "../Tools/BuildDir";
+import { getBuildDir } from "../Tools/BuildDir.js";
-import printErrorOrDebug from "../Tools/PrintErrorOrDebug";
+import printErrorOrDebug from "../Tools/PrintErrorOrDebug.js";
-import protectPath from "../Tools/ProtectPath";
+import protectPath from "../Tools/ProtectPath.js";
 
 export default class CppProject implements Project , SourceFiles,HaveCompiler,Optimize {
     name: string;

src/Project/Project.ts

@@ -1,4 +1,4 @@
-import Compiler from "../Compiler/Compiler"
+import Compiler from "../Compiler/Compiler.js"
 
 export default  interface Project{
     name:string;

src/Project/interface/HaveCompiler.ts

@@ -1,4 +1,4 @@
-import Compiler from "../../Compiler/Compiler";
+import Compiler from "../../Compiler/Compiler.js";
 
 export default interface HaveCompiler{
     compiler:Compiler

src/Project/interface/SourceFiles.ts

@@ -1,4 +1,4 @@
-import Project from "../Project"
+import Project from "../Project.js"
 
 export default interface SourceFiles{
     sourceFilesPath:string[]

src/Tools/AddProject.ts

@@ -1,6 +1,6 @@
-import Project from "../Project/Project";
+import Project from "../Project/Project.js";
-import printErrorOrDebug from "./PrintErrorOrDebug";
+import printErrorOrDebug from "./PrintErrorOrDebug.js";
-import { getGlobalProjects } from "./Projects";
+import { getGlobalProjects } from "./Projects.js";
 
 export const addProject = (f:{():Project}) =>{
     const project = f()

src/Tools/BuildDir.ts

@@ -1,6 +1,6 @@
 import path from "path"
-import { getGlobalNmake } from "./GlobalNmake"
+import { getGlobalNmake } from "./GlobalNmake.js"
-import { getNmakeDir } from "./NmakeDir"
+import { getNmakeDir } from "./NmakeDir.js"
 
 export const getBuildDir = ():string=>{
     if(getGlobalNmake()["buildDir"]==undefined){

src/Tools/DefaultCompiler.ts

@@ -1,4 +1,4 @@
-import Compiler from "../Compiler/Compiler"
+import Compiler from "../Compiler/Compiler.js"
 
 const Global = (global as any)
 

src/Tools/GetExecutablePathsFromEnv.ts

@@ -1,4 +1,4 @@
-import getPathsFromEnv from "./GetPathsFromEnv";
+import getPathsFromEnv from "./GetPathsFromEnv.js";
 
 const getExecutablePathsFromEnv = (name:string):string[]=>{
     const ret:string[]=[];

src/Tools/NmakeDir.ts

@@ -1,6 +1,6 @@
 import path from "path"
-import { getNmakePath } from "./NmakePath"
+import { getNmakePath } from "./NmakePath.js"
-import printDebug from "./DebugPrint"
+import printDebug from "./DebugPrint.js"
 
 export const getNmakeDir =():string=>{
     let nmakeDir = path.join(getNmakePath(),"../")

src/Tools/NmakePath.ts

@@ -1,6 +1,6 @@
-import printDebug from "./DebugPrint";
+import printDebug from "./DebugPrint.js";
-import { getGlobalNmake } from "./GlobalNmake"
+import { getGlobalNmake } from "./GlobalNmake.js"
-import printErrorOrDebug from "./PrintErrorOrDebug";
+import printErrorOrDebug from "./PrintErrorOrDebug.js";
 
 
 export const setNmakePath = (path:string)=>{

src/Tools/Projects.ts

@@ -1,5 +1,5 @@
-import Project from "../Project/Project"
+import Project from "../Project/Project.js"
-import { getGlobalNmake } from "./GlobalNmake"
+import { getGlobalNmake } from "./GlobalNmake.js"
 
 export const getGlobalProjects = (): { [key: string]: Project } => {
     if (getGlobalNmake().projects == undefined) {

src/Tools/SetGetDefaultCompiler.ts

@@ -1,6 +1,6 @@
-import Compiler from "../Compiler/Compiler"
+import Compiler from "../Compiler/Compiler.js"
-import printDebug from "./DebugPrint"
+import printDebug from "./DebugPrint.js"
-import { getDefaultCompiler, setDefaultCompiler } from "./DefaultCompiler"
+import { getDefaultCompiler, setDefaultCompiler } from "./DefaultCompiler.js"
 
 const setGetDefaultCompiler = (name: string, newCompiler: { (): Compiler }) => {
     let defaultCompiler = getDefaultCompiler("g++")

src/Tools/SourceFilesToString.ts

@@ -1,5 +1,5 @@
-import SourceFiles from "../Project/interface/SourceFiles";
+import SourceFiles from "../Project/interface/SourceFiles.js";
-import printDebug from "./DebugPrint";
+import printDebug from "./DebugPrint.js";
 
 const sourceFilesToString = (project:SourceFiles):string=>{
     let ret = ""

src/Tools/TryGetCompilerVersion.ts

@@ -1,5 +1,5 @@
 import { exec, execSync } from "child_process"
-import printDebug from "./DebugPrint";
+import printDebug from "./DebugPrint.js";
 
 const tryGetCompilerVersion =(path:string,command:string):string=>{
     const exec_command = `${path} ${command}`

src/index.ts

@@ -1,11 +1,13 @@
 import path from "path";
-import printDebug from "./Tools/DebugPrint";
+import printDebug from "./Tools/DebugPrint.js";
 import { existsSync } from "fs";
-import printErrorOrDebug from "./Tools/PrintErrorOrDebug";
+import printErrorOrDebug from "./Tools/PrintErrorOrDebug.js";
-import { setNmakePath } from "./Tools/NmakePath";
+import { setNmakePath } from "./Tools/NmakePath.js";
-import CppBuilder from "./Builder/CppBuilder";
+import CppBuilder from "./Builder/CppBuilder.js";
 
-const argv = require('minimist')(process.argv.slice(2))
+// const argv = require('minimist')(process.argv.slice(2))
+import minimist from "minimist";
+const argv = minimist(process.argv.slice(2))
 
 let nmakeFileName = "nmake.ts"
 if(argv["v"])(global as any).isDebug=true
@@ -22,22 +24,31 @@ printDebug("found nmake file")
 setNmakePath(nmakeFilePath)
 
 printDebug("adding ts-node")
-require("ts-node").register()
+import ts_node from "ts-node" 
+import { pathToFileURL } from "url";
+ts_node.register()
 
 printDebug("adding global values")
 
 console.log("running nmake file "+nmakeFilePath)
 printDebug(`running file ${nmakeFilePath}`)
-require(nmakeFilePath)
+// require(nmakeFilePath)
+
+import(pathToFileURL(nmakeFilePath).toString())
 printDebug(`run completion!`,nmakeFilePath)
 
-if (argv[0]) {
+if(argv["b"]){
-    switch (argv[0]) {
+    printDebug("will build the project")
-        case "b":
+    await new CppBuilder().build()
-            new CppBuilder().build()
+}
-            break;
 
-        default:
+// if (argv[0]) {
-            break;
+//     switch (argv[0]) {
-    }
+//         case "b":
-}
+            
+//             break;
+    
+//         default:
+//             break;
+//     }
+// }

src/interface/NmakeGlobal.ts

@@ -1,4 +1,4 @@
-import Project from "../Project/Project";
+import Project from "../Project/Project.js";
 
 export default interface NmakeGlobal{
     projects:{[key:string]:Project}

tests/test2/nmake.js

@@ -0,0 +1,6 @@
+import CppProject from "../../src/Project/CppProject.js";
+import { addProject } from "../../src/Tools/AddProject.js";
+// const compiler = new GppCompiler()
+addProject(function () {
+    return new CppProject("hello");
+});

tests/test2/nmake.ts

@@ -1,5 +1,5 @@
-import CppProject from "../../src/Project/CppProject";
+import CppProject from "../../src/Project/CppProject.js";
-import { addProject } from "../../src/Tools/AddProject";
+import { addProject } from "../../src/Tools/AddProject.js";
 
 // const compiler = new GppCompiler()
 

tests/test2/tsconfig.json

@@ -0,0 +1,109 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig to read more about this file */
+
+    /* Projects */
+    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
+    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
+    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
+    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
+    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+
+    /* Language and Environment */
+    "target": "ES2023",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+    // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
+    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
+    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
+    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
+    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
+
+    /* Modules */
+    "module": "ESNext",                                /* Specify what module code is generated. */
+    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
+    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
+    // "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
+    // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
+    // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
+    // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
+    // "resolveJsonModule": true,                        /* Enable importing .json files. */
+    // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
+    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
+
+    /* JavaScript Support */
+    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
+    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
+
+    /* Emit */
+    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
+    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+    // "removeComments": true,                           /* Disable emitting comments. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
+    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
+    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
+    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
+    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
+    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
+    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+
+    /* Interop Constraints */
+    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+    // "verbatimModuleSyntax": true,                     /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
+    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
+    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+
+    /* Type Checking */
+    "strict": true,                                      /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
+    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
+    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
+    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
+    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
+    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
+    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+
+    /* Completeness */
+    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+  }
+}

tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "ES6",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ESNext",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
@@ -25,7 +25,7 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "CommonJS",                                /* Specify what module code is generated. */
+    "module": "NodeNext",                                /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */