@simplysm/sd-cli 11.0.39 → 11.1.1

package/dist/utils/SdCliBuildResultUtil.js

@@ -1,38 +1,38 @@
-import ts from "typescript";
-import os from "os";
-import path from "path";
-export class SdCliBuildResultUtil {
-    static convertFromTsDiag(diag, type) {
-        const severity = diag.category === ts.DiagnosticCategory.Error ? "error"
-            : diag.category === ts.DiagnosticCategory.Warning ? "warning"
-                : diag.category === ts.DiagnosticCategory.Suggestion ? "suggestion"
-                    : "message";
-        const code = `TS${diag.code}`;
-        const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
-        const filePath = diag.file ? path.resolve(diag.file.fileName) : undefined;
-        const position = diag.file && diag.start !== undefined ? diag.file.getLineAndCharacterOfPosition(diag.start) : undefined;
-        const line = position ? position.line + 1 : undefined;
-        const char = position ? position.character + 1 : undefined;
-        return {
-            filePath: filePath !== undefined ? path.resolve(filePath) : undefined,
-            line,
-            char,
-            code,
-            severity,
-            message,
-            type: "build"
-        };
-    }
-    static getMessage(result) {
-        let str = "";
-        if (result.filePath !== undefined) {
-            str += `${result.filePath}(${result.line ?? 0}, ${result.char ?? 0}): `;
-        }
-        if (result.code !== undefined) {
-            str += `${result.code}: `;
-        }
-        str += `(${result.type}) ${result.severity} ${result.message}`;
-        return str;
-    }
-}
+import ts from "typescript";
+import os from "os";
+import path from "path";
+export class SdCliBuildResultUtil {
+    static convertFromTsDiag(diag, type) {
+        const severity = diag.category === ts.DiagnosticCategory.Error ? "error"
+            : diag.category === ts.DiagnosticCategory.Warning ? "warning"
+                : diag.category === ts.DiagnosticCategory.Suggestion ? "suggestion"
+                    : "message";
+        const code = `TS${diag.code}`;
+        const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
+        const filePath = diag.file ? path.resolve(diag.file.fileName) : undefined;
+        const position = diag.file && diag.start !== undefined ? diag.file.getLineAndCharacterOfPosition(diag.start) : undefined;
+        const line = position ? position.line + 1 : undefined;
+        const char = position ? position.character + 1 : undefined;
+        return {
+            filePath: filePath !== undefined ? path.resolve(filePath) : undefined,
+            line,
+            char,
+            code,
+            severity,
+            message,
+            type: "build"
+        };
+    }
+    static getMessage(result) {
+        let str = "";
+        if (result.filePath !== undefined) {
+            str += `${result.filePath}(${result.line ?? 0}, ${result.char ?? 0}): `;
+        }
+        if (result.code !== undefined) {
+            str += `${result.code}: `;
+        }
+        str += `(${result.type}) ${result.severity} ${result.message}`;
+        return str;
+    }
+}
 //# sourceMappingURL=SdCliBuildResultUtil.js.map

package/dist/utils/SdMemoryLoadResultCache.d.ts

@@ -1,9 +1,9 @@
-import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
-import { OnLoadResult } from 'esbuild';
-export declare class SdMemoryLoadResultCache extends MemoryLoadResultCache {
-    loadResults: Map<string, OnLoadResult>;
-    fileDependencies: Map<string, Set<string>>;
-    get(getPath: string): OnLoadResult | undefined;
-    put(putPath: string, result: OnLoadResult): Promise<void>;
-    invalidate(invalidatePath: string): boolean;
-}
+import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
+import { OnLoadResult } from 'esbuild';
+export declare class SdMemoryLoadResultCache extends MemoryLoadResultCache {
+    loadResults: Map<string, OnLoadResult>;
+    fileDependencies: Map<string, Set<string>>;
+    get(getPath: string): OnLoadResult | undefined;
+    put(putPath: string, result: OnLoadResult): Promise<void>;
+    invalidate(invalidatePath: string): boolean;
+}

package/dist/utils/SdMemoryLoadResultCache.js

@@ -1,35 +1,35 @@
-import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
-import path from "path";
-export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
-    constructor() {
-        super(...arguments);
-        this.loadResults = new Map();
-        this.fileDependencies = new Map();
-    }
-    get(getPath) {
-        return this.loadResults.get(getPath);
-    }
-    put(putPath, result) {
-        this.loadResults.set(putPath, result);
-        if (result.watchFiles) {
-            for (const watchFile of result.watchFiles) {
-                // Normalize the watch file path to ensure OS consistent paths
-                const watchFilePath = path.resolve(watchFile);
-                let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
-                affected.add(putPath);
-            }
-        }
-        return Promise.resolve();
-    }
-    invalidate(invalidatePath) {
-        const affected = this.fileDependencies.get(invalidatePath);
-        let found = false;
-        if (affected) {
-            affected.forEach((a) => (found ||= this.loadResults.delete(a)));
-            this.fileDependencies.delete(invalidatePath);
-        }
-        found ||= this.loadResults.delete(invalidatePath);
-        return found;
-    }
-}
+import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
+import path from "path";
+export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
+    constructor() {
+        super(...arguments);
+        this.loadResults = new Map();
+        this.fileDependencies = new Map();
+    }
+    get(getPath) {
+        return this.loadResults.get(getPath);
+    }
+    put(putPath, result) {
+        this.loadResults.set(putPath, result);
+        if (result.watchFiles) {
+            for (const watchFile of result.watchFiles) {
+                // Normalize the watch file path to ensure OS consistent paths
+                const watchFilePath = path.resolve(watchFile);
+                let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
+                affected.add(putPath);
+            }
+        }
+        return Promise.resolve();
+    }
+    invalidate(invalidatePath) {
+        const affected = this.fileDependencies.get(invalidatePath);
+        let found = false;
+        if (affected) {
+            affected.forEach((a) => (found ||= this.loadResults.delete(a)));
+            this.fileDependencies.delete(invalidatePath);
+        }
+        found ||= this.loadResults.delete(invalidatePath);
+        return found;
+    }
+}
 //# sourceMappingURL=SdMemoryLoadResultCache.js.map

package/dist/utils/SdSourceFileCache.d.ts

@@ -1,6 +1,6 @@
-import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
-import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
-export declare class SdSourceFileCache extends SourceFileCache {
-    readonly loadResultCache: SdMemoryLoadResultCache;
-    invalidate(files: Iterable<string>): void;
-}
+import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
+import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
+export declare class SdSourceFileCache extends SourceFileCache {
+    readonly loadResultCache: SdMemoryLoadResultCache;
+    invalidate(files: Iterable<string>): void;
+}

package/dist/utils/SdSourceFileCache.js

@@ -1,15 +1,15 @@
-import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
-import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
-export class SdSourceFileCache extends SourceFileCache {
-    constructor() {
-        super(...arguments);
-        this.loadResultCache = new SdMemoryLoadResultCache();
-    }
-    invalidate(files) {
-        super.invalidate(files);
-        for (let file of files) {
-            this.loadResultCache.invalidate(file);
-        }
-    }
-}
+import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
+import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
+export class SdSourceFileCache extends SourceFileCache {
+    constructor() {
+        super(...arguments);
+        this.loadResultCache = new SdMemoryLoadResultCache();
+    }
+    invalidate(files) {
+        super.invalidate(files);
+        for (let file of files) {
+            this.loadResultCache.invalidate(file);
+        }
+    }
+}
 //# sourceMappingURL=SdSourceFileCache.js.map

package/dist/utils/SdSourceFileCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"SdSourceFileCache.js","sourceRoot":"","sources":["../../src/utils/SdSourceFileCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,yEAAyE,CAAC;AAExG,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAAtD;;QACoB,oBAAe,GAAG,IAAI,uBAAuB,EAAE,CAAC;IASpE,CAAC;IAPU,UAAU,CAAC,KAAuB;QACzC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAExB,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACvC;IACH,CAAC;CACF"}
+{"version":3,"file":"SdSourceFileCache.js","sourceRoot":"","sources":["../../src/utils/SdSourceFileCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,2EAA2E,CAAC;AAE1G,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAAtD;;QACoB,oBAAe,GAAG,IAAI,uBAAuB,EAAE,CAAC;IASpE,CAAC;IAPU,UAAU,CAAC,KAAuB;QACzC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAExB,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACvC;IACH,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "11.0.39",
+  "version": "11.1.1",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -17,38 +17,38 @@
     "node": "^18"
   },
   "dependencies": {
-    "@angular-devkit/build-angular": "^16.2.9",
-    "@angular/common": "^16.2.12",
-    "@angular/compiler": "^16.2.12",
-    "@angular/compiler-cli": "^16.2.12",
-    "@angular/core": "^16.2.12",
+    "@angular-devkit/build-angular": "^17.0.0",
+    "@angular/common": "^17.0.1",
+    "@angular/compiler": "^17.0.1",
+    "@angular/compiler-cli": "^17.0.1",
+    "@angular/core": "^17.0.1",
     "@electron/rebuild": "^3.3.0",
-    "@simplysm/sd-core-common": "11.0.39",
-    "@simplysm/sd-core-node": "11.0.39",
-    "@simplysm/sd-service-server": "11.0.39",
-    "@simplysm/sd-storage": "11.0.39",
+    "@simplysm/sd-core-common": "11.1.1",
+    "@simplysm/sd-core-node": "11.1.1",
+    "@simplysm/sd-service-server": "11.1.1",
+    "@simplysm/sd-storage": "11.1.1",
     "browserslist": "^4.22.1",
     "cordova": "^12.0.0",
-    "electron": "^27.0.3",
-    "electron-builder": "^24.8.0",
-    "esbuild": "0.18.17",
+    "electron": "^27.0.4",
+    "electron-builder": "^24.8.1",
+    "esbuild": "^0.19.5",
     "esbuild-plugin-tsc": "^0.4.0",
     "eslint": "^8.53.0",
+    "jszip": "^3.10.1",
     "node-stdlib-browser": "^1.2.0",
     "rxjs": "^7.8.1",
     "sass": "^1.69.5",
     "semver": "^7.5.4",
     "xml2js": "^0.6.2",
     "yargs": "^17.7.2",
-    "zone.js": "~0.13.3",
-    "jszip": "^3.10.1"
+    "zone.js": "~0.14.2"
   },
   "devDependencies": {
-    "@types/eslint": "^8.44.6",
-    "@types/xml2js": "^0.4.13",
-    "@types/yargs": "^17.0.29"
+    "@types/eslint": "^8.44.7",
+    "@types/xml2js": "^0.4.14",
+    "@types/yargs": "^17.0.31"
   },
   "peerDependencies": {
-    "typescript": "^4.9.5"
+    "typescript": "~5.2.2"
   }
 }

package/src/build-tools/SdNgBundler.ts

@@ -1,9 +1,13 @@
 import {createCompilerPlugin} from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
 import path from "path";
-import {InitialFileRecord} from "@angular-devkit/build-angular/src/tools/esbuild/bundler-context";
+import {
+  BuildOutputFile,
+  BuildOutputFileType,
+  InitialFileRecord
+} from "@angular-devkit/build-angular/src/tools/esbuild/bundler-context";
 import esbuild, {Metafile} from "esbuild";
 import {FsUtil, PathUtil} from "@simplysm/sd-core-node";
-import {fileURLToPath, pathToFileURL} from "url";
+import {fileURLToPath} from "url";
 import {createVirtualModulePlugin} from "@angular-devkit/build-angular/src/tools/esbuild/virtual-module-plugin";
 import {
   createSourcemapIgnorelistPlugin
@@ -16,6 +20,7 @@ import {extractLicenses} from "@angular-devkit/build-angular/src/tools/esbuild/l
 import {augmentAppWithServiceWorkerEsbuild} from "@angular-devkit/build-angular/src/utils/service-worker";
 import browserslist from "browserslist";
 import {
+  convertOutputFile,
   createOutputFileFromText,
   transformSupportedBrowsersToTargets
 } from "@angular-devkit/build-angular/src/tools/esbuild/utils";
@@ -156,7 +161,10 @@ export class SdNgBundler {
     /*const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
     executionResult.outputFiles.push(...bundlingResult.outputFiles);*/
 
-    const outputFiles = bundlingResults.mapMany(item => item.outputFiles ?? []);
+    const outputFiles: BuildOutputFile[] = bundlingResults.mapMany(item => item.outputFiles?.map(file => {
+      const fileType = path.dirname(file.path) === 'media' ? BuildOutputFileType.Media : BuildOutputFileType.Browser;
+      return convertOutputFile(file, fileType);
+    }) ?? []);
     const initialFiles = new Map<string, InitialFileRecord>();
     const metafile: {
       inputs: Metafile["inputs"],
@@ -190,7 +198,7 @@ export class SdNgBundler {
 
     //-- cordova empty
     if (this._opt.cordovaConfig?.plugins) {
-      outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};"));
+      outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};", BuildOutputFileType.Browser));
     }
 
     //-- index
@@ -218,21 +226,21 @@ export class SdNgBundler {
         type: "build",
       });
     }
-    outputFiles.push(createOutputFileFromText("index.html", genIndexHtmlResult.content));
+    outputFiles.push(createOutputFileFromText("index.html", genIndexHtmlResult.content, BuildOutputFileType.Browser));
 
     //-- copy assets
     assetFiles.push(...(await this._copyAssetsAsync()));
 
     //-- extract 3rdpartylicenses
     if (!this._opt.dev) {
-      outputFiles.push(createOutputFileFromText('3rdpartylicenses.txt', await extractLicenses(metafile, this._opt.pkgPath)));
+      outputFiles.push(createOutputFileFromText('3rdpartylicenses.txt', await extractLicenses(metafile, this._opt.pkgPath), BuildOutputFileType.Root));
     }
 
     //-- service worker
     if (FsUtil.exists(this._swConfFilePath)) {
       try {
         const serviceWorkerResult = await this._genServiceWorkerAsync(outputFiles, assetFiles);
-        outputFiles.push(createOutputFileFromText('ngsw.json', serviceWorkerResult.manifest));
+        outputFiles.push(createOutputFileFromText('ngsw.json', serviceWorkerResult.manifest, BuildOutputFileType.Browser));
         assetFiles.push(...serviceWorkerResult.assetFiles);
       }
       catch (err) {
@@ -395,7 +403,7 @@ export class SdNgBundler {
   }
 
   private async _genServiceWorkerAsync(
-    outputFiles: esbuild.OutputFile[],
+    outputFiles: BuildOutputFile[],
     assetFiles: {
       source: string;
       destination: string;
@@ -494,7 +502,7 @@ export class SdNgBundler {
       },
       inject: [PathUtil.posix(fileURLToPath(await import.meta.resolve!("node-stdlib-browser/helpers/esbuild/shim")))],
       plugins: [
-        {
+        /*{
           name: "sd-worker",
           setup: ({onLoad}) => {
             onLoad({filter: /\.ts$/}, async args => {
@@ -558,7 +566,7 @@ export class SdNgBundler {
               return undefined;
             });
           }
-        },
+        },*/
         ...this._opt.cordovaConfig?.plugins ? [{
           name: "cordova:plugin-empty",
           setup: ({onResolve}) => {
@@ -581,13 +589,14 @@ export class SdNgBundler {
         createSourcemapIgnorelistPlugin(),
         createCompilerPlugin({
           sourcemap: this._opt.dev,
-          thirdPartySourcemaps: false,
           tsconfig: this._tsConfigFilePath,
           jit: false,
           advancedOptimizations: true,
+          thirdPartySourcemaps: false,
           fileReplacements: undefined,
           sourceFileCache: this._sourceFileCache,
-          loadResultCache: this._sourceFileCache.loadResultCache
+          loadResultCache: this._sourceFileCache.loadResultCache,
+          incremental: this._opt.dev
         }, {
           workspaceRoot: this._opt.pkgPath,
           optimization: !this._opt.dev,

package/src/utils/SdSourceFileCache.ts

@@ -1,5 +1,5 @@
 import {SdMemoryLoadResultCache} from "./SdMemoryLoadResultCache";
-import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
+import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
 
 export class SdSourceFileCache extends SourceFileCache {
   override readonly loadResultCache = new SdMemoryLoadResultCache();