@intelligentgraphics/ig.gfx.packager 3.0.28 → 3.1.0-alpha.0

package/build/{index-B9e-vtmM.mjs → index-B2kXo6K7.mjs}

@@ -1,21 +1,21 @@
 import * as path from 'path';
 import * as fs$1 from 'fs/promises';
 import * as terser from 'terser';
+import { EOL } from 'os';
+import ts from 'typescript';
 import * as fs from 'fs';
 import 'resolve';
 import 'write-pkg';
-import { e as readPackageAnimationList, r as readPackageCreatorManifest, i as isErrorENOENT, q as readPackageNpmManifest } from './cli-RWjcRDQ7.mjs';
-import glob from 'glob';
+import { e as readPackageAnimationList, r as readPackageCreatorManifest, q as readPackageNpmManifest, i as isErrorENOENT } from './cli-CuiqZ39_.mjs';
+import { g as getPackageTypescriptFiles, i as isScriptPackageModules } from './scripts-Bfojy_uD.mjs';
 import 'node:path';
 import 'node:fs';
 import 'axios';
-import ts from 'typescript';
-import { g as getPackageTypescriptFiles } from './scripts-EvIjiH6G.mjs';
 import typedoc from 'typedoc';
+import glob from 'glob';
 import require$$2 from 'events';
 import { SourceMapGenerator, SourceMapConsumer } from 'source-map-js';
 import Ajv from 'ajv';
-import { EOL } from 'os';
 
 const consoleReporter = {
     log (message) {
@@ -51,19 +51,6 @@ const tryReadTsConfig = (location)=>{
 };
 const createTSCBuildParticipant = (location, outputDir)=>(env)=>{
         const files = getPackageTypescriptFiles(location);
-        if (files.length === 0) {
-            env.onBuildStart();
-            env.onBuildEnd({
-                type: "success",
-                artefacts: {
-                    js: "",
-                    definitions: ""
-                }
-            });
-            return {
-                destroy: ()=>{}
-            };
-        }
         try {
             env.onBuildStart();
             env.log("Compiling typescript files");
@@ -101,7 +88,7 @@ const createTSCBuildParticipant = (location, outputDir)=>(env)=>{
                     type: "success",
                     artefacts: {
                         js: js.replace(`//# sourceMappingURL=out.js.map`, ""),
-                        definitions,
+                        declarations: definitions,
                         sourceMap
                     }
                 });
@@ -194,7 +181,7 @@ const createTSCWatchBuildParticipant = (location, outputDir)=>{
                         type: "success",
                         artefacts: {
                             js: emitState.js.replace(`//# sourceMappingURL=out.js.map`, ""),
-                            definitions: emitState.definitions,
+                            declarations: emitState.definitions,
                             sourceMap: emitState.sourceMap
                         }
                     });
@@ -208,17 +195,6 @@ const createTSCWatchBuildParticipant = (location, outputDir)=>{
             getNewLine: ()=>ts.sys.newLine
         };
         const watchProgram = ts.createWatchProgram(host);
-        const files = getPackageTypescriptFiles(location);
-        if (files.length === 0) {
-            onBuildStart();
-            onBuildEnd({
-                type: "success",
-                artefacts: {
-                    js: "",
-                    definitions: ""
-                }
-            });
-        }
         return {
             destroy: ()=>{
                 watchProgram.close();
@@ -304,12 +280,7 @@ const toposort = (packages)=>{
 
 class BuildManager extends require$$2 {
     constructor(manifest, writer, reporter){
-        super();
-        this.manifest = manifest;
-        this.writer = writer;
-        this.reporter = reporter;
-        this.participants = new Map();
-        this.states = new Map();
+        super(), this.manifest = manifest, this.writer = writer, this.reporter = reporter, this.participants = new Map(), this.states = new Map();
     }
     addParticipant(name, participant) {
         this.participants.set(name, participant);
@@ -382,14 +353,16 @@ class BuildManager extends require$$2 {
                                 line: lines + mapping.generatedLine,
                                 column: mapping.generatedColumn
                             },
-                            original: {
+                            original: mapping.originalLine !== null && mapping.originalColumn !== null ? {
                                 line: mapping.originalLine,
                                 column: mapping.originalColumn
-                            },
+                            } : undefined,
                             source: mapping.source,
                             name: mapping.name
                         });
-                        sources.add(mapping.source);
+                        if (mapping.source !== null) {
+                            sources.add(mapping.source);
+                        }
                     });
                     for (const source of sources){
                         const content = sourceMap.sourceContentFor(source);
@@ -400,13 +373,13 @@ class BuildManager extends require$$2 {
                 }
                 completeResult.js += result.artefacts.js;
             }
-            if (result.artefacts.definitions) {
-                if (completeResult.definitions) {
-                    completeResult.definitions += "\n";
+            if (result.artefacts.declarations) {
+                if (completeResult.declarations) {
+                    completeResult.declarations += "\n";
                 } else {
-                    completeResult.definitions = "";
+                    completeResult.declarations = "";
                 }
-                completeResult.definitions += result.artefacts.definitions;
+                completeResult.declarations += result.artefacts.declarations;
             }
         }
         completeResult.sourceMap = sourceMapGenerator.toString();
@@ -749,7 +722,7 @@ const createAnimationBuildParticipant = (location, manifest)=>{
             env.onBuildEnd({
                 type: "success",
                 artefacts: {
-                    js: (result == null ? void 0 : result.js) ?? ""
+                    js: result?.js ?? ""
                 }
             });
         }).catch((err)=>{
@@ -769,7 +742,7 @@ const createAnimationWatchBuildParticipant = (location, manifest)=>(env)=>{
             env.onBuildEnd({
                 type: "success",
                 artefacts: {
-                    js: (result == null ? void 0 : result.js) ?? ""
+                    js: result?.js ?? ""
                 }
             });
         }).catch((err)=>{
@@ -780,15 +753,14 @@ const createAnimationWatchBuildParticipant = (location, manifest)=>(env)=>{
         });
         (async ()=>{
             for await (const event of fs$1.watch(location.scriptsDir)){
-                var _event_filename;
-                if ((_event_filename = event.filename) == null ? void 0 : _event_filename.endsWith(".animation.json")) {
+                if (event.filename?.endsWith(".animation.json")) {
                     env.onBuildStart();
                     try {
                         const result = await bundleAnimations(location, manifest, env.log);
                         env.onBuildEnd({
                             type: "success",
                             artefacts: {
-                                js: (result == null ? void 0 : result.js) ?? ""
+                                js: result?.js ?? ""
                             }
                         });
                     } catch (err) {
@@ -866,7 +838,187 @@ const getAnimationJsonValidation = async ()=>{
     return validateAnimationJson;
 };
 
-const buildFolders = async (options)=>{
+// Stolen from ig.tools.core
+class PackageVersion {
+    static{
+        // https://regex101.com/r/90PEY9/1
+        this.fullTextMatcher = /(\d+)(\.(\d+)(\.(\d+)(\.(\d+))?(-([^\.]+)\.(\d+))?)?)?/;
+    }
+    static{
+        this.lineMatcher = /^(\d+)(\.(\d+)(\.(\d+)(\.(\d+))?(-([^\.]+)\.(\d+))?)?)?$/;
+    }
+    static extractFromText(input, description) {
+        if (input === undefined) {
+            throw new Error(`Can not parse version from undefined`);
+        }
+        const match = input.match(PackageVersion.fullTextMatcher);
+        if (!match) {
+            throw new Error(`Could not extract a version from input: ${input}`);
+        }
+        return PackageVersion.fromMatch(match, description);
+    }
+    static extractFromLine(input, description) {
+        if (input === undefined) {
+            throw new Error(`Can not parse version from undefined`);
+        }
+        const match = input.match(PackageVersion.lineMatcher);
+        if (!match) {
+            throw new Error(`Could not parse version from input: ${input}`);
+        }
+        return PackageVersion.fromMatch(match, description);
+    }
+    static equals(a, b, checkPrerelease = false) {
+        if (a.major !== b.major || a.minor !== b.minor || a.patch !== b.patch) {
+            return false;
+        }
+        if (checkPrerelease === false) {
+            return true;
+        }
+        if (a.preRelease === b.preRelease) {
+            return true;
+        }
+        if (a.preRelease === undefined || b.preRelease === undefined) {
+            return false;
+        }
+        return a.preRelease.type === b.preRelease.type && a.preRelease.version === b.preRelease.version;
+    }
+    static fromMatch([, major, , minor = "0", , patch = "0", , build, , preReleaseType, preReleaseNumber], description) {
+        let preRelease = undefined;
+        let buildNumber = 100;
+        if (preReleaseType && preReleaseNumber) {
+            preRelease = {
+                type: preReleaseType,
+                version: parseInt(preReleaseNumber)
+            };
+        }
+        if (build) {
+            buildNumber = Number(build);
+        } else if (description) {
+            const descriptionMatch = description.match(/(\d+)\)$/);
+            if (descriptionMatch) {
+                buildNumber = parseInt(descriptionMatch[1]);
+            }
+        }
+        return new PackageVersion(parseInt(major), parseInt(minor), parseInt(patch), preRelease, buildNumber);
+    }
+    static sort(a, b, ascending = true) {
+        const createSortResult = (a, b)=>ascending ? a - b : b - a;
+        if (a.major !== b.major) {
+            return createSortResult(a.major, b.major);
+        }
+        if (a.minor !== b.minor) {
+            return createSortResult(a.minor, b.minor);
+        }
+        if (a.patch !== b.patch) {
+            return createSortResult(a.patch, b.patch);
+        }
+        return createSortResult(a.preRelease ? a.preRelease.version : 0, b.preRelease ? b.preRelease.version : 0);
+    }
+    static toNumber(version) {
+        return ((version.major * 1000 + version.minor) * 1000 + version.patch) * 1000 + version.buildNumber;
+    }
+    constructor(major, minor, patch, preRelease, buildNumber){
+        this.major = major;
+        this.minor = minor;
+        this.patch = patch;
+        this.preRelease = preRelease;
+        this.buildNumber = buildNumber;
+    }
+    isPreRelease() {
+        return this.preRelease !== undefined;
+    }
+    clone() {
+        return new PackageVersion(this.major, this.minor, this.patch, this.preRelease ? {
+            ...this.preRelease
+        } : undefined, this.buildNumber);
+    }
+    incrementMajor() {
+        this.preRelease = undefined;
+        this.patch = 0;
+        this.minor = 0;
+        this.major++;
+    }
+    incrementMinor() {
+        this.preRelease = undefined;
+        this.patch = 0;
+        this.minor++;
+    }
+    incrementPatch() {
+        this.preRelease = undefined;
+        this.patch++;
+    }
+    createPreRelease(type) {
+        if (!this.preRelease) {
+            this.buildNumber = 1;
+        } else {
+            this.buildNumber++;
+        }
+        if (this.preRelease && type === this.preRelease.type) {
+            this.preRelease.version++;
+            return;
+        }
+        this.preRelease = {
+            version: 0,
+            type
+        };
+    }
+    createRelease() {
+        this.preRelease = undefined;
+        this.buildNumber = 100;
+    }
+    toVersionString({ buildNumber } = {}) {
+        let version = [
+            this.major,
+            this.minor,
+            this.patch
+        ].join(".");
+        if (buildNumber) {
+            version += "." + this.buildNumber;
+        }
+        if (this.preRelease) {
+            version += `-${this.preRelease.type}.${this.preRelease.version}`;
+        }
+        return version;
+    }
+    toDescriptionString(packageName) {
+        const base = [
+            this.major,
+            this.minor,
+            this.patch
+        ].join(".");
+        const parts = [
+            packageName,
+            base
+        ];
+        if (this.preRelease) {
+            parts.push(upperCaseFirst(this.preRelease.type));
+            parts.push(this.preRelease.version);
+        }
+        parts.push(`(${base}.${this.buildNumber})`);
+        return parts.join(" ");
+    }
+    /**
+	 * Determines wether the version is lesser than the input version
+	 *
+	 * @param {PackageVersion} version
+	 * @returns
+	 */ isLesserThan(version) {
+        return PackageVersion.toNumber(this) < PackageVersion.toNumber(version);
+    }
+    /**
+	 * Determines wether the version is greater than the input version
+	 *
+	 * @param {PackageVersion} version
+	 * @returns
+	 */ isGreaterThan(version) {
+        return PackageVersion.toNumber(this) > PackageVersion.toNumber(version);
+    }
+}
+const upperCaseFirst = (input)=>{
+    return input.slice(0, 1).toUpperCase() + input.slice(1);
+};
+
+async function buildFolders(options) {
     if (options.outDir !== undefined && options.clean) {
         await fs$1.rm(options.outDir, {
             recursive: true
@@ -883,7 +1035,7 @@ const buildFolders = async (options)=>{
         ]));
     const maxNameLength = Array.from(manifests.values(), (manifest)=>manifest.Package.length).reduce((acc, length)=>Math.max(acc, length), 0);
     for (const location of sortedPackages){
-        await ensureTsConfig(location);
+        const tsConfig = await ensureTsConfig(location);
         const data = manifests.get(location);
         const reporter = options.preparedReporter ?? createPackageScopedReporter(baseReporter, data.Package, index, folders.length, maxNameLength);
         const outputDirectory = options.outDir || location.scriptsDir;
@@ -894,7 +1046,18 @@ const buildFolders = async (options)=>{
         if (options.banner) {
             manager.addParticipant("banner", createBannerCommentBuildParticipant(options.banner));
         }
-        manager.addParticipant("tsc", createTSCBuildParticipant(location, outputDirectory));
+        const typescriptFiles = getPackageTypescriptFiles(location);
+        if (!typescriptFiles.some((file)=>path.basename(file).toLowerCase() === "version.ts")) {
+            manager.addParticipant("version", createVersionLogBuildParticipant(data));
+        }
+        if (typescriptFiles.length > 0) {
+            if (isScriptPackageModules(tsConfig.options)) {
+                const { createRollupBuildParticipant } = await import('./rollup-UR3DADp8.mjs');
+                manager.addParticipant("rollup", createRollupBuildParticipant(location, data, outputDirectory));
+            } else {
+                manager.addParticipant("tsc", createTSCBuildParticipant(location, outputDirectory));
+            }
+        }
         manager.addParticipant("animation", createAnimationBuildParticipant(location, data));
         await new Promise((resolve, reject)=>{
             manager.addListener("start", ()=>{
@@ -915,8 +1078,8 @@ const buildFolders = async (options)=>{
         }
         index++;
     }
-};
-const buildFoldersWatch = async (options)=>{
+}
+async function buildFoldersWatch(options) {
     if (options.outDir !== undefined && options.clean) {
         await fs$1.rm(options.outDir, {
             recursive: true
@@ -932,7 +1095,7 @@ const buildFoldersWatch = async (options)=>{
         ]));
     const maxNameLength = Array.from(manifests.values(), (manifest)=>manifest.Package.length).reduce((acc, length)=>Math.max(acc, length), 0);
     for (const location of sortedPackages){
-        await ensureTsConfig(location);
+        const tsConfig = await ensureTsConfig(location);
         const baseReporter = options.reporter ?? consoleReporter;
         const data = manifests.get(location);
         const reporter = createPackageScopedReporter(baseReporter, data.Package, index, folders.length, maxNameLength);
@@ -944,7 +1107,18 @@ const buildFoldersWatch = async (options)=>{
         if (options.banner) {
             manager.addParticipant("banner", createBannerCommentBuildParticipant(options.banner));
         }
-        manager.addParticipant("tsc", createTSCWatchBuildParticipant(location, outputDirectory));
+        const typescriptFiles = getPackageTypescriptFiles(location);
+        if (!typescriptFiles.some((file)=>path.basename(file).toLowerCase() === "version.ts")) {
+            manager.addParticipant("version", createVersionLogBuildParticipant(data));
+        }
+        if (typescriptFiles.length > 0) {
+            if (isScriptPackageModules(tsConfig.options)) {
+                const { createRollupWatchBuildParticipant } = await import('./rollup-UR3DADp8.mjs');
+                manager.addParticipant("rollup", createRollupWatchBuildParticipant(location, data, outputDirectory));
+            } else {
+                manager.addParticipant("tsc", createTSCWatchBuildParticipant(location, outputDirectory));
+            }
+        }
         manager.addParticipant("animation", createAnimationWatchBuildParticipant(location, data));
         await new Promise((resolve, reject)=>{
             manager.addListener("start", ()=>{
@@ -963,8 +1137,8 @@ const buildFoldersWatch = async (options)=>{
         index++;
     }
     await new Promise(()=>{});
-};
-const writeBuildResult = async (buildResult, manifest, location, workspace, outputDirectory, minimize, reporter)=>{
+}
+async function writeBuildResult(buildResult, manifest, location, workspace, outputDirectory, minimize, reporter) {
     let js = buildResult.js;
     if (buildResult.sourceMap) {
         js += `\n//# sourceMappingURL=${manifest.Package}.js.map`;
@@ -972,8 +1146,8 @@ const writeBuildResult = async (buildResult, manifest, location, workspace, outp
     await fs$1.writeFile(path.join(outputDirectory, `${manifest.Package}.js`), js, {
         encoding: "utf8"
     });
-    if (buildResult.definitions !== undefined) {
-        await fs$1.writeFile(path.join(outputDirectory, `${manifest.Package}.d.ts`), buildResult.definitions, {
+    if (buildResult.declarations !== undefined) {
+        await fs$1.writeFile(path.join(outputDirectory, `${manifest.Package}.d.ts`), buildResult.declarations, {
             encoding: "utf8"
         });
     }
@@ -1001,54 +1175,94 @@ const writeBuildResult = async (buildResult, manifest, location, workspace, outp
             });
         }
     }
-    if (location.path.includes("Basics") && buildResult.definitions !== undefined) {
+    if (location.path.includes("Basics") && buildResult.declarations !== undefined) {
         await fs$1.mkdir(path.join(workspace.path, "lib"), {
             recursive: true
         });
         reporter.log("Copying basics definition file to the lib folder");
-        await fs$1.writeFile(path.join(workspace.path, "lib", `${manifest.Package}.d.ts`), buildResult.definitions, {
+        await fs$1.writeFile(path.join(workspace.path, "lib", `${manifest.Package}.d.ts`), buildResult.declarations, {
             encoding: "utf8"
         });
     }
-};
-const createBannerCommentBuildParticipant = (options)=>(env)=>{
+}
+function createVersionLogBuildParticipant(manifest) {
+    return (env)=>{
+        env.onBuildStart();
+        const parsedVersion = manifest.Version !== undefined ? PackageVersion.extractFromLine(manifest.Version) : undefined;
+        let logText;
+        if (parsedVersion !== undefined) {
+            logText = parsedVersion.toDescriptionString(manifest.Package);
+        } else {
+            logText = manifest.Package;
+        }
+        logText += ".";
+        if (manifest.Copyright !== undefined) {
+            logText += " " + manifest.Copyright;
+        }
+        env.onBuildEnd({
+            type: "success",
+            artefacts: {
+                js: `console.log(${JSON.stringify(logText)})`
+            }
+        });
+        return {
+            destroy: ()=>{}
+        };
+    };
+}
+function createBannerCommentBuildParticipant(options) {
+    return (env)=>{
         env.onBuildStart();
         const banner = createBannerComment(options);
         env.onBuildEnd({
             type: "success",
             artefacts: {
                 js: banner ?? "",
-                definitions: banner ?? ""
+                declarations: banner ?? ""
             }
         });
         return {
             destroy: ()=>{}
         };
     };
-const ensureTsConfig = async (location)=>{
+}
+async function ensureTsConfig(location) {
     const tsconfigPath = path.join(location.scriptsDir, "tsconfig.json");
     try {
         const content = JSON.parse(await fs$1.readFile(tsconfigPath, "utf8"));
-        applyTsConfigOption(content);
+        applyTsConfigOptions(content);
         await fs$1.writeFile(tsconfigPath, JSON.stringify(content, undefined, "\t"), "utf8");
+        return ts.parseJsonConfigFileContent(content, ts.sys, location.scriptsDir);
     } catch (err) {
         if (!isErrorENOENT(err)) {
             throw err;
         }
         const content = {};
-        applyTsConfigOption(content);
+        applyTsConfigOptions(content);
         await fs$1.writeFile(tsconfigPath, JSON.stringify(content, undefined, "\t"), "utf8");
+        return ts.parseJsonConfigFileContent(content, ts.sys, location.scriptsDir);
     }
-};
-const applyTsConfigOption = (data)=>{
-    data.compilerOptions = data.compilerOptions ?? {};
-    data.compilerOptions.target = "es5";
-    data.compilerOptions.lib = [
-        "es5",
-        "dom"
-    ];
-};
-const sortPackagesByBuildOrder = (folders)=>{
+}
+function applyTsConfigOptions(data) {
+    if (data.compilerOptions?.module?.toLowerCase().startsWith("es")) {
+        data.compilerOptions = data.compilerOptions ?? {};
+        data.compilerOptions.target = "esnext";
+        data.compilerOptions.lib = [
+            "esnext",
+            "dom"
+        ];
+        data.compilerOptions.module = "es2015";
+        data.compilerOptions.moduleResolution = "node";
+    } else {
+        data.compilerOptions = data.compilerOptions ?? {};
+        data.compilerOptions.target = "es5";
+        data.compilerOptions.lib = [
+            "es5",
+            "dom"
+        ];
+    }
+}
+function sortPackagesByBuildOrder(folders) {
     const packages = Array.from(folders).reduce((acc, location)=>{
         const data = readPackageNpmManifest(location);
         if (data !== undefined) {
@@ -1088,8 +1302,8 @@ const sortPackagesByBuildOrder = (folders)=>{
         }
     }
     return result;
-};
-const createBannerComment = (banner)=>{
+}
+function createBannerComment(banner) {
     const bannerParts = [];
     if (banner.text) {
         bannerParts.push(" * " + banner.text);
@@ -1123,7 +1337,7 @@ ${bannerText}
 */`;
     }
     return undefined;
-};
+}
 
 var index = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -1131,5 +1345,5 @@ var index = /*#__PURE__*/Object.freeze({
     buildFoldersWatch: buildFoldersWatch
 });
 
-export { consoleReporter as a, buildFolders as b, createPackageScopedReporter as c, index as i };
-//# sourceMappingURL=index-B9e-vtmM.mjs.map
+export { PackageVersion as P, consoleReporter as a, buildFolders as b, createPackageScopedReporter as c, index as i };
+//# sourceMappingURL=index-B2kXo6K7.mjs.map