@simplysm/sd-cli 7.0.249 → 7.0.267

package/dist/builder/SdCliTsLibBuilder.mjs

@@ -104,25 +104,31 @@ export class SdCliTsLibBuilder extends EventEmitter {
             const watchBuildResults = [];
             this._logger.debug("프로그램 로딩...");
             const watchBuildPack = this._createSdBuildPack(this._parsedTsconfig);
-            this._logger.debug("빌드...");
-            watchBuildResults.push(...await this._runBuilderAsync(watchBuildPack.builder, watchBuildPack.ngCompiler));
-            this._logger.debug("린트...");
+            const promises = [];
+            // 빌드
+            promises.push(this._runBuilderAsync(watchBuildPack.builder, watchBuildPack.ngCompiler));
+            // watchBuildResults.push(...await this._runBuilderAsync(watchBuildPack.builder, watchBuildPack.ngCompiler));
+            // 린트
             const lintFilePaths = [
                 ...watchBuildPack.affectedSourceFiles.map((item) => item.fileName),
                 ...changedInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path)
             ];
             if (lintFilePaths.length > 0) {
-                watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths, watchBuildPack.program));
+                promises.push(this._linter.lintAsync(lintFilePaths, watchBuildPack.program));
+                // watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths, watchBuildPack.program));
             }
+            this._logger.debug("빌드...");
+            watchBuildResults.push(...(await Promise.all(promises)).mapMany());
             this._logger.debug("변경감지 대상목록 재구성...");
             const watchRelatedPaths = await this.getAllRelatedPathsAsync();
             watcher.add(watchRelatedPaths);
             this.emit("complete", watchBuildResults);
         });
         this._logger.debug("빌드...");
-        const buildResults = await this._runBuilderAsync(buildPack.builder, buildPack.ngCompiler);
-        this._logger.debug("린트...");
-        buildResults.push(...await this._linter.lintAsync(relatedPaths, buildPack.program));
+        const buildResults = (await Promise.all([
+            this._runBuilderAsync(buildPack.builder, buildPack.ngCompiler),
+            this._linter.lintAsync(relatedPaths, buildPack.program)
+        ].filterExists())).mapMany();
         this._logger.debug("변경감지 대상목록 재구성...");
         const watchRelatedPaths = await this.getAllRelatedPathsAsync();
         watcher.add(watchRelatedPaths);
@@ -142,11 +148,11 @@ export class SdCliTsLibBuilder extends EventEmitter {
         this._logger.debug("프로그램 로딩...");
         const buildPack = this._createSdBuildPack(this._parsedTsconfig);
         this._logger.debug("빌드...");
-        const buildResults = await this._runBuilderAsync(buildPack.builder, buildPack.ngCompiler);
-        this._logger.debug("린트...");
         const relatedPaths = await this.getAllRelatedPathsAsync();
-        buildResults.push(...await this._linter.lintAsync(relatedPaths, buildPack.program));
-        return buildResults;
+        return (await Promise.all([
+            this._runBuilderAsync(buildPack.builder, buildPack.ngCompiler),
+            this._linter.lintAsync(relatedPaths, buildPack.program)
+        ].filterExists())).mapMany();
     }
     async getAllRelatedPathsAsync() {
         const workspaceNpmConfig = this._getNpmConfig(this._workspaceRootPath);
@@ -308,4 +314,4 @@ export class SdCliTsLibBuilder extends EventEmitter {
         return this._npmConfigMap.get(pkgPath);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliTsLibBuilder.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../src/builder/SdCliTsLibBuilder.ts"],"names":[],"mappings":"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"}

package/dist/commons.d.ts

@@ -4,7 +4,7 @@ export interface INpmConfig {
     description?: string;
     author?: string;
     license?: string;
-    repository: string | {
+    repository?: {
         type: string;
         url: string;
         directory?: string;
@@ -27,6 +27,8 @@ export interface INpmConfig {
 }
 export interface ITsconfig {
     compilerOptions?: {
+        module?: string;
+        lib?: string[];
         outDir?: string;
         baseUrl?: string;
         paths?: Record<string, string[]>;
@@ -102,8 +104,10 @@ export interface ISdCliGithubPublishConfig {
     }[];
 }
 export interface ISdCliClientBuilderWebConfig {
+    env?: Record<string, string>;
 }
 export interface ISdCliClientBuilderCordovaConfig {
+    env?: Record<string, string>;
     appId: string;
     appName: string;
     plugins?: string[];
@@ -127,4 +131,5 @@ export interface ISdCliClientBuilderElectronConfig {
     appId: string;
     icon?: string;
     installerIcon?: string;
+    env?: Record<string, string>;
 }

package/dist/entry-points/SdCliPrepare.mjs

@@ -13,40 +13,40 @@ export class SdCliPrepare {
         const fileUrl = await import.meta.resolve("typescript");
         const filePath = fileURLToPath(fileUrl);
         const fileContent = await FsUtil.readFileAsync(filePath);
-        const modifiedFileContent = fileContent.replace(`
-        function checkSourceElement(node) {
-            if (node) {
-                var saveCurrentNode = currentNode;
-                currentNode = node;
-                instantiationCount = 0;
-                checkSourceElementWorker(node);
-                currentNode = saveCurrentNode;
-            }
-        }`, `
-        function checkSourceElement(node) {
-            if (node) {
-                const prevUsage = process.cpuUsage();
-
-                var saveCurrentNode = currentNode;
-                currentNode = node;
-                instantiationCount = 0;
-                checkSourceElementWorker(node);
-                currentNode = saveCurrentNode;
-
-                const usage = process.cpuUsage(prevUsage);
-                if (node.hasChildPerformanceWarning) {
-                    node.parent.hasChildPerformanceWarning = true;
-                }
-                else if (usage.user + usage.system > 1000 * 1000 && node.kind !== 253) {
-                    error(node, {
-                        code: 9000,
-                        category: ts.DiagnosticCategory.Warning,
-                        key: "simplysm_check_source_element_performance_slow",
-                        message: "소스코드 타입분석에 너무 오랜 시간이 소요됩니다. [" + Math.round((usage.user + usage.system) / 1000) + "ms/cpu, KIND: " + node.kind + "]"
-                    });
-                    node.parent.hasChildPerformanceWarning = true;
-                }
-            }
+        const modifiedFileContent = fileContent.replace(`
+        function checkSourceElement(node) {
+            if (node) {
+                var saveCurrentNode = currentNode;
+                currentNode = node;
+                instantiationCount = 0;
+                checkSourceElementWorker(node);
+                currentNode = saveCurrentNode;
+            }
+        }`, `
+        function checkSourceElement(node) {
+            if (node) {
+                const prevUsage = process.cpuUsage();
+
+                var saveCurrentNode = currentNode;
+                currentNode = node;
+                instantiationCount = 0;
+                checkSourceElementWorker(node);
+                currentNode = saveCurrentNode;
+
+                const usage = process.cpuUsage(prevUsage);
+                if (node.hasChildPerformanceWarning) {
+                    node.parent.hasChildPerformanceWarning = true;
+                }
+                else if (usage.user + usage.system > 1000 * 1000 && node.kind !== 253) {
+                    error(node, {
+                        code: 9000,
+                        category: ts.DiagnosticCategory.Warning,
+                        key: "simplysm_check_source_element_performance_slow",
+                        message: "소스코드 타입분석에 너무 오랜 시간이 소요됩니다. [" + Math.round((usage.user + usage.system) / 1000) + "ms/cpu, KIND: " + node.kind + "]"
+                    });
+                    node.parent.hasChildPerformanceWarning = true;
+                }
+            }
         }`);
         await FsUtil.writeFileAsync(filePath, modifiedFileContent);
         return modifiedFileContent.includes("const prevUsage = process.cpuUsage();");

package/dist/entry-points/SdCliProjectGenerator.d.ts

@@ -0,0 +1,44 @@
+export declare class SdCliProjectGenerator {
+    private readonly _rootPath;
+    private readonly _logger;
+    constructor(_rootPath: string);
+    initAsync(opt: {
+        name?: string;
+        description: string;
+        author: string;
+        gitUrl: string;
+    }): Promise<void>;
+    addTsLibAsync(opt: {
+        name: string;
+        description: string;
+        useDom: boolean;
+        isForAngular: boolean;
+    }): Promise<void>;
+    addDbLibAsync(opt: {
+        name: string;
+    }): Promise<void>;
+    addDbLibModelAsync(opt: {
+        dbPkgName: string;
+        category: string;
+        name: string;
+        description: string;
+    }): Promise<void>;
+    addServerAsync(opt: {
+        name?: string;
+        description?: string;
+    }): Promise<void>;
+    addClientAsync(opt: {
+        name: string;
+        description: string;
+        serverName: string;
+    }): Promise<void>;
+    addPageAsync(opt: {
+        pkgName: string;
+        category?: string;
+        name: string;
+        isRouteParent: boolean;
+    }): Promise<void>;
+    private _addPackageBaseTemplate;
+    private _addPackageToSimplysmJson;
+    private _getProjNpmConfigAsync;
+}