@jointhedots/gear 1.0.21 → 1.1.5

package/esm/commands/make.js

@@ -1,14 +1,18 @@
 import Path from 'node:path';
 import Fs from 'node:fs';
+import {} from "yargs";
 import { StorageFiles } from "../model/storage.js";
-import { open_workspace } from "../model/workspace.js";
+import { Bundle, Library, open_workspace } from "../model/workspace.js";
 import { build_application } from "../builder/build-application.js";
-import { build_library, make_libname } from "../builder/build-library.js";
+import { build_app_composable_bundle } from "../builder/build-app-bundle.js";
+import { build_library } from "../builder/build-library.js";
+import { makeNormalizedName, NameStyle } from '../utils/normalized-name.js';
 export function command_make() {
     return {
         command: 'make',
         describe: 'Make distribuable artifacts',
         builder: (yargs) => yargs
+            .strict()
             .option("apps", {
             type: "string",
             default: "",
@@ -18,6 +22,12 @@ export function command_make() {
             type: "string",
             default: "",
             describe: "List of libraries to make, ex: lib1,lib2,..."
+        })
+            .option("bundles", {
+            type: "string",
+            alias: "buns",
+            default: "",
+            describe: "List of bundles to make, ex: lib1,lib2,..."
         })
             .option("watch", {
             type: "boolean",
@@ -40,19 +50,24 @@ export function command_make() {
             type: "string",
             default: "*",
             describe: "Version applied to delivered package (use * for root package version)"
+        })
+            .option("ws", {
+            type: "string",
+            default: ".",
+            describe: "Workspace directory"
         })
             .option("dist", {
             type: "string",
             default: "./dist",
         }),
         handler: async (argv) => {
-            const ws = await open_workspace(".", argv.devmode);
+            const ws = await open_workspace(argv.ws, argv.devmode);
             if (argv.devmode)
-                console.log("> Use devmode");
+                ws.log.warn("Use devmode");
             let version = argv.versioned;
             if (version === "*") {
                 version = JSON.parse(Fs.readFileSync("package.json").toString())?.version;
-                console.log(`> Use version: ${version}`);
+                ws.log.warn(`Use version: ${version}`);
             }
             let libraries = [];
             if (argv.libs === "*") {
@@ -64,7 +79,22 @@ export function command_make() {
                     if (lib)
                         libraries.push(lib);
                     else
-                        console.error(`> library not found: ${libname}`);
+                        ws.log.error(`library not found: ${libname}`);
+                }
+            }
+            const bundles = [];
+            if (argv.bundles === "*") {
+                for (const bundle of ws.bundles) {
+                    bundles.push(bundle);
+                }
+            }
+            else if (argv.bundles) {
+                for (const name of argv.bundles.split(",")) {
+                    const bundle = ws.get_bundle(name);
+                    if (bundle)
+                        bundles.push(bundle);
+                    else
+                        ws.log.error(`Bundle not found: ${name}`);
                 }
             }
             let applications = [];
@@ -74,13 +104,26 @@ export function command_make() {
                     if (app)
                         applications.push(app);
                     else
-                        console.error(`> application not found: ${appname}`);
+                        ws.log.error(`application not found: ${appname}`);
                 }
             }
             const pendings = [];
+            if (bundles.length > 0) {
+                const shelve = new StorageFiles("shelve", Path.resolve(argv.dist, "shelve"));
+                for (const bundle of bundles) {
+                    pendings.push(build_app_composable_bundle({
+                        bundle,
+                        shelve,
+                        version: version,
+                        devmode: argv.devmode,
+                        watch: argv.watch,
+                        clean: argv.clean || !argv.devmode,
+                    }));
+                }
+            }
             for (const app of applications) {
                 const { name } = app.descriptor;
-                const outputDir = Path.resolve(argv.dist, make_libname(name));
+                const outputDir = Path.resolve(argv.dist, makeNormalizedName(name, NameStyle.WEBC));
                 const storage = new StorageFiles(name, outputDir);
                 pendings.push(build_application({
                     app,
@@ -92,7 +135,7 @@ export function command_make() {
                 }));
             }
             for (const lib of libraries) {
-                const outputDir = Path.resolve(argv.dist, make_libname(lib.name));
+                const outputDir = Path.resolve(argv.dist, makeNormalizedName(lib.name, NameStyle.WEBC));
                 const storage = new StorageFiles(lib.name, outputDir);
                 pendings.push(build_library({
                     library: lib,

package/esm/commands/make.js.map

@@ -1 +1 @@
-{"version":3,"file":"make.js","sourceRoot":"","sources":["../../src/commands/make.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"make.js","sourceRoot":"","sources":["../../src/commands/make.ts"],"names":[],"mappings":"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"}

package/esm/commands/publish.js

@@ -1,4 +1,5 @@
 import Path from 'node:path';
+import {} from "yargs";
 import { publish_aws_s3 } from '../publish/publish_aws_s3.js';
 import { open_workspace } from "../model/workspace.js";
 export function command_publish() {

package/esm/commands/publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,UAAU,eAAe;IAM5B,OAAO;QACJ,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,6BAA6B;QACvC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aACrB,MAAM,CAAC,KAAK,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;SAChB,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;SAChB,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,YAAY;SACvB,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,QAAQ;SACnB,CAAC;QACL,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACzC,MAAM,EAAE,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YAC3C,MAAM,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAC1E,CAAC;KACH,CAAA;AACJ,CAAC"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAsB,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,UAAU,eAAe;IAM5B,OAAO;QACJ,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,6BAA6B;QACvC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aACrB,MAAM,CAAC,KAAK,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;SAChB,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;SAChB,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,YAAY;SACvB,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,QAAQ;SACnB,CAAC;QACL,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACzC,MAAM,EAAE,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YAC3C,MAAM,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAC1E,CAAC;KACH,CAAA;AACJ,CAAC"}

package/esm/commands/run.js

@@ -3,6 +3,7 @@ import Process from 'process';
 import Path from 'path';
 import ChildProcess from 'child_process';
 import { createRequire } from "module";
+import {} from "yargs";
 const restart_always_on_change = true;
 const require = createRequire(import.meta.url);
 export function command_run() {

package/esm/commands/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,YAAY,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAsB,MAAM,OAAO,CAAA;AAE1C,MAAM,wBAAwB,GAAG,IAAI,CAAA;AAErC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAE9C,MAAM,UAAU,WAAW;IAOxB,OAAO;QACJ,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,8BAA8B;QACxC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aACrB,MAAM,CAAC,KAAK,EAAE;YACZ,QAAQ,EAAE,0CAA0C;YACpD,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;SACf,CAAC;aACD,MAAM,CAAC,OAAO,EAAE;YACd,QAAQ,EAAE,4BAA4B;YACtC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;SACf,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YAChB,QAAQ,EAAE,kBAAkB;YAC5B,IAAI,EAAE,QAAQ;SAChB,CAAC;aACD,MAAM,CAAC,OAAO,EAAE;YACd,QAAQ,EAAE,8BAA8B;YACxC,IAAI,EAAE,SAAS;SACjB,CAAC;aACD,mBAAmB,CAAC;YAClB,YAAY,EAAE,IAAI;SACpB,CAAC;QACL,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrB,IAAI,OAAO,GAAQ,IAAI,CAAA;YACvB,IAAI,oBAAoB,GAAQ,SAAS,CAAA;YACzC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;YACrD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;YACnC,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,CAAC,GAAG,SAAS,IAAI,CAAC,KAAK,UAAU,CAAC,CAAA;YAE9E,SAAS,KAAK,CAAC,SAAS,GAAG,KAAK;gBAE7B,IAAI,SAAS,GAAa,EAAE,CAAA;gBAC5B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBAChB,IAAI,SAAS,IAAI,IAAI,CAAC,KAAK;wBAAE,SAAS,GAAG,IAAI,CAAA;oBAC7C,SAAS,CAAC,IAAI,CAAC,YAAY,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;gBACxE,CAAC;;oBACI,SAAS,GAAG,KAAK,CAAA;gBAEtB,OAAO,CAAC,GAAG,CAAC,kCAAkC,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;gBAC3F,OAAO,GAAG,YAAY,CAAC,KAAK,CACzB,MAAM,EACN;oBACG,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,6BAA6B,CAAC;oBAC7D,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC;oBACzD,sBAAsB;oBACtB,GAAG,SAAS;oBACZ,UAAU;oBACV,GAAG,UAAU;iBACf,EACD;oBACG,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;iBACxD,CACH,CAAA;gBACD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACzB,OAAO,GAAG,IAAI,CAAA;oBACd,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;wBACtC,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAA;wBAC9D,oBAAoB,GAAG,SAAS,CAAA;wBAChC,KAAK,EAAE,CAAA;oBACV,CAAC;yBACI,CAAC;wBACH,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,kFAAkF,CAAC,CAAA;oBAClI,CAAC;gBACJ,CAAC,CAAC,CAAA;YACL,CAAC;YAED,SAAS,OAAO;gBACb,MAAM,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAA;gBAC/D,IAAI,aAAa,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;oBACvD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;wBAC3B,IAAI,oBAAoB,KAAK,KAAK,EAAE,CAAC;4BAClC,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAA;4BACpE,IAAI,OAAO;gCAAE,OAAO,CAAC,IAAI,EAAE,CAAA;;gCACtB,KAAK,EAAE,CAAA;wBACf,CAAC;oBACJ,CAAC,EAAE,GAAG,CAAC,CAAA;oBACP,oBAAoB,GAAG,KAAK,CAAA;gBAC/B,CAAC;YACJ,CAAC;YAED,SAAS,UAAU,CAAC,GAAG;gBACpB,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC,CAAC,QAAQ;oBAC5B,IAAI,CAAC,OAAO;wBAAE,KAAK,CAAC,KAAK,CAAC,CAAA;gBAC7B,CAAC;qBACI,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC,CAAC,YAAY;oBACrC,IAAI,CAAC,OAAO;wBAAE,KAAK,CAAC,IAAI,CAAC,CAAA;gBAC5B,CAAC;qBACI,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC,CAAC,SAAS;oBAClC,OAAO,CAAC,IAAI,EAAE,CAAA;gBACjB,CAAC;YACJ,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAC9B,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAA;YACtB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;YAEpC,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAQ,CAAA;YAC/D,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;YACrC,KAAK,EAAE,CAAA;QACV,CAAC;KACH,CAAA;AACJ,CAAC"}

package/esm/commands/serve.js

@@ -1,9 +1,11 @@
 import Path from 'node:path';
 import Fs from 'node:fs';
+import {} from "yargs";
 import { StorageFiles } from "../model/storage.js";
-import { open_workspace } from "../model/workspace.js";
+import { open_workspace, Workspace } from "../model/workspace.js";
 import { build_application } from "../builder/build-application.js";
-import { make_libname } from "../builder/build-library.js";
+import { makeNormalizedName, NameStyle } from '../utils/normalized-name.js';
+import Express from 'express';
 export function command_serve() {
     return {
         command: 'serve',
@@ -25,33 +27,64 @@ export function command_serve() {
             type: "string",
             default: "*",
             describe: "Version applied to delivered package (use * for root package version)"
+        })
+            .option("ws", {
+            type: "string",
+            default: ".",
+            describe: "Workspace directory"
         })
             .option("dist", {
             type: "string",
             default: "./dist",
         }),
         handler: async (argv) => {
-            const ws = await open_workspace(".", argv.devmode);
+            const ws = await open_workspace(argv.ws, argv.devmode);
             const app = ws.get_application(argv.app);
             if (!app)
-                throw new Error(`Application '${argv.app}' not exists`);
+                throw new Error(`Application '${argv.app}' not exists. Note: 'package.json' shall have "componentsContainer": true`);
             if (argv.devmode)
-                console.log("> Use devmode");
+                ws.log.warn("Use devmode");
             let version = argv.versioned;
             if (version === "*") {
                 version = JSON.parse(Fs.readFileSync("package.json").toString())?.version;
-                console.log(`> Use version: ${version}`);
+                ws.log.warn(`Use version: ${version}`);
             }
-            const outputDir = Path.resolve(argv.dist, make_libname(argv.app));
+            const outputDir = Path.resolve(argv.dist, makeNormalizedName(argv.app, NameStyle.WEBC));
             const storage = new StorageFiles(ws.name, outputDir);
-            await build_application({
+            const building = build_application({
                 app,
                 storage,
                 version,
                 devmode: argv.devmode,
-                port: argv.port,
+                devserver: argv.port && `http://localhost:${argv.port}`,
             });
+            if (argv.port) {
+                await Promise.all([
+                    building,
+                    serve(ws, argv.port, storage)
+                ]);
+            }
+            else {
+                await building;
+            }
         }
     };
 }
+async function serve(ws, port, storage) {
+    const app = Express();
+    app.use((req, res, next) => {
+        res.setHeader("Access-Control-Allow-Origin", "*");
+        res.setHeader('Access-Control-Allow-Methods', '*');
+        res.setHeader("Access-Control-Allow-Headers", "*");
+        next();
+    });
+    app.get('/esbuild', storage.on_changes.route());
+    app.get('/{*path}', storage.route());
+    app.listen(port, () => {
+        ws.log.success(`Server is running at http://localhost:${port}`);
+    });
+    return new Promise((resolve) => {
+        process.on('SIGQUIT', () => resolve(null));
+    });
+}
 //# sourceMappingURL=serve.js.map

package/esm/commands/serve.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,MAAM,SAAS,CAAA;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAE1D,MAAM,UAAU,aAAa;IAO1B,OAAO;QACJ,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,6CAA6C;QACvD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK;aACrB,MAAM,CAAC,KAAK,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;SAChB,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YAChB,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SAChB,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;SACf,CAAC;aACD,MAAM,CAAC,WAAW,EAAE;YAClB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,GAAG;YACZ,QAAQ,EAAE,uEAAuE;SACnF,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,QAAQ;SACnB,CAAC;QACL,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrB,MAAM,EAAE,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YAClD,MAAM,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACxC,IAAI,CAAC,GAAG;gBAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,GAAG,cAAc,CAAC,CAAA;YACjE,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;YAE9C,IAAI,OAAO,GAAG,IAAI,CAAC,SAAS,CAAA;YAC5B,IAAI,OAAO,KAAK,GAAG,EAAE,CAAC;gBACnB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAA;gBACzE,OAAO,CAAC,GAAG,CAAC,kBAAkB,OAAO,EAAE,CAAC,CAAA;YAC3C,CAAC;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;YACjE,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;YACpD,MAAM,iBAAiB,CAAC;gBACrB,GAAG;gBACH,OAAO;gBACP,OAAO;gBACP,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,IAAI,EAAE,IAAI,CAAC,IAAI;aACjB,CAAC,CAAA;QACL,CAAC;KACH,CAAA;AACJ,CAAC"}
+{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"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"}

package/esm/model/component.js

@@ -1,28 +1,23 @@
+import { isNormalizedName, makeNormalizedName, NameStyle } from "../utils/normalized-name.js";
 export function checkComponentManifest(manif, path) {
     if (typeof manif.$id !== "string") {
-        return new Error(`Component descriptor shall have '$id' at: ${path}`);
+        return new Error(`Component shall have '$id' at: ${path}`);
     }
-    if (!isValidComponentName(manif.$id)) {
-        return new Error(`Component descriptor have invalid '$id' -> '${manif.$id}' at: ${path}`);
+    if (!isNormalizedName(manif.$id)) {
+        return new Error(`Component have invalid '$id=${manif.$id}' suggest '${makeNormalizedName(manif.$id, NameStyle.OBJECT)}' at: ${path}`);
     }
     return null;
 }
 export function makeComponentPublication(manif) {
-    const id = manif.$id;
     return {
-        component_id: id,
+        id: manif.$id,
         type: manif.type,
         icon: manif.icon,
-        title: manif.title || manif.name || id,
+        title: manif.title || manif.name || manif.$id,
         services: manif.services ? Object.keys(manif.services) : [],
         description: manif.description || "",
         keywords: manif.keywords,
         tags: manif.tags,
     };
 }
-const check_name_regex = /^(?![xX][mM][lL])[a-z](([.0-9_a-z\-]*-[.0-9_a-z\-]*)|([.0-9_a-z:]*:[.0-9_a-z:]*))$/;
-export function isValidComponentName(name) {
-    //return check_name_regex.test(name)
-    return true;
-}
 //# sourceMappingURL=component.js.map

package/esm/model/component.js.map

@@ -1 +1 @@
-{"version":3,"file":"component.js","sourceRoot":"","sources":["../../src/model/component.ts"],"names":[],"mappings":"AA8DA,MAAM,UAAU,sBAAsB,CAAC,KAAwB,EAAE,IAAY;IAC1E,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,IAAI,KAAK,CAAC,6CAA6C,IAAI,EAAE,CAAC,CAAA;IACxE,CAAC;IACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO,IAAI,KAAK,CAAC,+CAA+C,KAAK,CAAC,GAAG,SAAS,IAAI,EAAE,CAAC,CAAA;IAC5F,CAAC;IACD,OAAO,IAAI,CAAA;AACd,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAwB;IAC9D,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAA;IACpB,OAAO;QACJ,YAAY,EAAE,EAAE;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,EAAE;QACtC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;QAC3D,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE;QACpC,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,IAAI,EAAE,KAAK,CAAC,IAAI;KAClB,CAAA;AACJ,CAAC;AAED,MAAM,gBAAgB,GAAG,oFAAoF,CAAA;AAE7G,MAAM,UAAU,oBAAoB,CAAC,IAAI;IACtC,oCAAoC;IACpC,OAAO,IAAI,CAAA;AACd,CAAC"}
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../src/model/component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAiG7F,MAAM,UAAU,sBAAsB,CAAC,KAAwB,EAAE,IAAY;IAC1E,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,IAAI,KAAK,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAA;IAC7D,CAAC;IACD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,IAAI,KAAK,CAAC,+BAA+B,KAAK,CAAC,GAAG,cAAc,kBAAkB,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IACzI,CAAC;IACD,OAAO,IAAI,CAAA;AACd,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAwB;IAC9D,OAAO;QACJ,EAAE,EAAE,KAAK,CAAC,GAAG;QACb,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG;QAC7C,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;QAC3D,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE;QACpC,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,IAAI,EAAE,KAAK,CAAC,IAAI;KAClB,CAAA;AACJ,CAAC"}

package/esm/model/helpers/create-manifests.js

@@ -0,0 +1,69 @@
+import { makeComponentPublication } from "../component.js";
+function create_export_map(lib, bun) {
+    const exports = {};
+    if (bun) {
+        for (const id in bun.distribueds) {
+            const basename = lib.make_file_id("redist", id);
+            const entry = lib.resolve_entry_path(id, lib.path);
+            exports[id] = {
+                id,
+                basename: basename,
+                filename: `${basename}.js`,
+                source: entry,
+            };
+        }
+    }
+    for (const key in lib.descriptor.exports) {
+        const exp = lib.descriptor.exports[key];
+        const basename = key.startsWith("./") ? key.slice(2) : key;
+        const filename = lib.make_file_id("export", basename);
+        const entry = lib.resolve_entry_path(typeof exp === "string" ? exp : exp?.import, lib.path);
+        const id = `${lib.name}${basename === "." ? "" : "/" + basename}`;
+        exports[id] = {
+            id,
+            exported: key,
+            basename: filename,
+            filename: `${filename}.js`,
+            source: entry,
+        };
+    }
+    return exports;
+}
+export function create_manifests(lib, bun, build_version) {
+    const entries = create_export_map(lib, bun);
+    let bundle_manif = null;
+    if (bun) {
+        bundle_manif = bun.manifest;
+        const components = [];
+        for (const comp of bun.components.values()) {
+            components.push(makeComponentPublication(comp));
+        }
+        bundle_manif.data = {
+            baseline: bun.id + "-v0",
+            components: components,
+            exports: {},
+        };
+        for (const id in entries) {
+            const exp = entries[id];
+            bundle_manif.data.exports[id] = exp.filename;
+        }
+    }
+    // Add bundle package.json 
+    const { exports, scripts, devDependencies, bundledDependencies, optionalDependencies, ...packageFields } = lib.descriptor;
+    const pkg_manif = {
+        ...packageFields,
+        name: lib.name,
+        version: build_version || lib.descriptor.version,
+        type: "module",
+    };
+    for (const id in entries) {
+        const exp = entries[id];
+        if (exp.exported) {
+            if (!pkg_manif.exports)
+                pkg_manif.exports = {};
+            pkg_manif.exports[exp.exported] = { import: `./${exp.filename}`, types: "./types.d.ts" };
+        }
+    }
+    return { package: pkg_manif, bundle: bundle_manif, entries };
+}
+//# sourceMappingURL=create-manifests.js.map

package/esm/model/helpers/create-manifests.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-manifests.js","sourceRoot":"","sources":["../../../src/model/helpers/create-manifests.ts"],"names":[],"mappings":"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"}