miqro 1.8.3 → 1.8.6

package/dist/cli.js

@@ -25,100 +25,100 @@ const db_createmodel_1 = require("./cmds/db-createmodel");
 const db_push_data_1 = require("./cmds/db-push-data");
 const db_dump_data_1 = require("./cmds/db-dump-data");
 const db_migrate_1 = require("./cmds/db-migrate");
-//import {main as wcCompileSFC, usage as wcCompileSFCUsage} from "./cmds/wc-compile-sfc";
+const wc_compile_sfc_1 = require("./cmds/wc-compile-sfc");
 const wc_cache_templates_1 = require("./cmds/wc-cache-templates");
 // noinspection SpellCheckingInspection
 (0, utils_1.mainCMD)({
-    ["new"]: { section: "api development", cb: new_1.mainJS, tabs: 5, description: `create a new project. ${new_1.usageJS}` },
-    ["new:typescript"]: { cb: new_1.mainTS, tabs: 4, description: `create a new typescript project. ${new_1.usageTS}` },
+    ["new"]: { section: "api development", cb: new_1.mainJS, tabs: 5, description: `create a new project.` },
+    ["new:typescript"]: { cb: new_1.mainTS, tabs: 4, description: `create a new typescript project.` },
     ["new:main"]: {
         //section: "http scafolding",
         cb: handler_main_new_1.main,
         tabs: 4,
-        description: `creates a new main file. ${handler_main_new_1.usage}`
+        description: `creates a new main file.`
     },
-    ["new:route"]: { cb: handler_apiroute_new_1.main, tabs: 4, description: `creates a new route. ${handler_apiroute_new_1.usage}` },
+    ["new:route"]: { cb: handler_apiroute_new_1.main, tabs: 4, description: `creates a new route.` },
     ["config"]: {
         //section: "config managment",
         cb: config_1.main,
         tabs: 5,
-        description: `outputs to stdout the config as a json. ${config_1.usage}`
+        description: `print config as a json.`
     },
     ["config:bash"]: {
         cb: config_bash_1.main,
         tabs: 4,
-        description: `outputs to stdout the config as a bash script. ${config_bash_1.usage}`
+        description: `print config as a bash script.`
     },
     ["config:env"]: {
         cb: config_env_1.main,
         tabs: 4,
-        description: `outputs to stdout the config as a env file. ${config_env_1.usage}`
+        description: `print config as a env file.`
     },
-    ["config:init"]: { cb: config_init_1.main, tabs: 4, description: `inits your config folder. ${config_init_1.usage}` },
+    ["config:init"]: { cb: config_init_1.main, tabs: 4, description: `inits your config folder.` },
     ["doc"]: {
         //section: "api documentation",
         tabs: 5,
         cb: doc_json_1.main,
-        description: `outputs to stdout an api folder auto doc as a json. ${doc_json_1.usage}`
+        description: `api folder auto doc as a json.`
     },
     ["doc:md"]: {
         cb: doc_md_1.main,
         tabs: 5,
-        description: `outputs to a file an api folder auto doc as a markdown. ${doc_md_1.usage}`
+        description: `api folder auto doc as a markdown.`
     },
-    ["new:front"]: { section: "front development", cb: wc_new_1.mainJS, tabs: 4, description: `create a new project. ${wc_new_1.usageJS}` },
-    ["new:front:typescript"]: { cb: wc_new_1.mainTS, tabs: 3, description: `create a new typescript project. ${wc_new_1.usageTS}` },
+    ["new:front"]: { section: "front development", cb: wc_new_1.mainJS, tabs: 4, description: `create a new project.` },
+    ["new:front:typescript"]: { cb: wc_new_1.mainTS, tabs: 3, description: `create a new typescript project.` },
     ["generate:template:cache"]: {
         //section: "web components",
         tabs: 3,
-        cb: wc_cache_templates_1.main, description: `generate a cache.json for webcomponents. ${wc_cache_templates_1.usage}`
+        cb: wc_cache_templates_1.main, description: `generate cache.json for webcomponents.`
+    },
+    ["sfc"]: {
+        tabs: 5,
+        cb: wc_compile_sfc_1.main, description: `transform sfc files to javascript.`
     },
-    /*["sfc"]: {
-      tabs: 6,
-      cb: wcCompileSFC, description: `transpiles a single file webcomponent to commonjs file for packing. ${wcCompileSFCUsage}`
-    },*/
     ["start"]: {
         section: "start helpers",
         tabs: 5,
         cb: start_1.main,
-        description: `start a nodejs script in cluster mode and restart if crash. ${start_1.usage}`
+        description: `start script in cluster mode.`
     },
     ["watch"]: {
         //section: "watch",
         cb: watch_1.main,
         tabs: 5,
-        description: `watch a folder for changes and runs a command if a change occours. ${watch_1.usage}`
+        description: `watch folder for changes.`
     },
     ["serve"]: {
         //section: "serve static files",
         tabs: 5,
-        cb: serve_1.main, description: `serve static files. ${serve_1.usage}`
+        cb: serve_1.main, description: `serve static files.`
     },
-    ["test"]: { section: "testing", cb: test_1.main, tabs: 5, description: `run test files. ${test_1.usage}` },
-    ["new:test"]: { cb: new_test_1.main, tabs: 4, description: `create new test.js file. ${new_test_1.usage}` },
+    ["test"]: { section: "testing", cb: test_1.main, tabs: 5, description: `run test files.` },
+    ["new:test"]: { cb: new_test_1.main, tabs: 4, description: `create new test.js file.` },
     ["db:console"]: {
         section: "sequelize helpers",
         cb: db_console_1.main,
         tabs: 4,
-        description: `runs a readline interface that send the input as a query. ${db_console_1.usage}`
+        description: `a query console for sequelize.`
     },
     ["db:dump:data"]: {
         cb: db_dump_data_1.main,
         tabs: 4,
-        description: `dump the data of the database (only defined models). ${db_dump_data_1.usage}`
+        description: `dump the data of the database.`
     },
-    ["db:push:data"]: { cb: db_push_data_1.main, tabs: 4, description: `push a dump to the database. ${db_push_data_1.usage}` },
+    ["db:push:data"]: { cb: db_push_data_1.main, tabs: 4, description: `push a dump to the database.` },
     ["db:make:migration"]: {
         cb: db_makemigrations_1.main,
         tabs: 3,
-        description: `seeks changes in your models and creates migrations. ${db_makemigrations_1.usage}`
+        description: `generate migrations from model changes.`
     },
     ["db:make:migration:force:clean:state"]: {
         cb: db_sync_makemigrations_1.main,
         tabs: 1,
-        description: `regenerate _current.json in the migrations folder to force the 'local' migration state to be the same as the current models. ${db_sync_makemigrations_1.usage}`
+        description: `force 'local' model state.`
     },
-    ["db:migrate"]: { cb: db_migrate_1.main, tabs: 4, description: `loads config/<NODE_ENV>/*.env config and runs npx sequelize-cli db:migrate <...args>. ${db_migrate_1.usage}` },
-    ["db:init"]: { cb: db_init_1.main, tabs: 5, description: `init sequelize configuration. ${db_init_1.usage}` },
-    ["db:create:model"]: { cb: db_createmodel_1.main, tabs: 4, description: `creates an example model. ${db_createmodel_1.usage}` }
+    ["db:migrate"]: { cb: db_migrate_1.main, tabs: 4, description: `loads config and run migrations.` },
+    ["db:init"]: { cb: db_init_1.main, tabs: 5, description: `init sequelize configuration.` },
+    ["db:create:model"]: { cb: db_createmodel_1.main, tabs: 4, description: `creates an example model.` }
 }, "npx miqro <command> [args]", console);

package/dist/cmds/wc-compile-sfc.d.ts

@@ -0,0 +1,2 @@
+export declare const usage = "npx miqro sfc <sfcDir> <outDir> [-m @miqro/web-components] [-e \".js\"]";
+export declare const main: () => Promise<void>;

package/dist/cmds/wc-compile-sfc.js

@@ -0,0 +1,195 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = exports.usage = void 0;
+const path_1 = require("path");
+const fs_1 = require("fs");
+const xml_js_1 = require("../utils/xml.js");
+const utils_1 = require("../utils");
+exports.usage = "npx miqro sfc <sfcDir> <outDir> [-m @miqro/web-components] [-e \".js\"]";
+const DATA_SHADOW_ROOT_MODE = "data-shadow-root-mode";
+const main = async () => {
+    const flags = (0, utils_1.extractFlags)(process.argv.slice(3), {
+        flags: {
+            "m": {
+                description: "module to require defineFunction",
+                hasValue: true
+            },
+            "o": {
+                description: "extension of output",
+                hasValue: true
+            },
+            "i": {
+                description: "extension of input",
+                hasValue: true
+            },
+            "c": {
+                description: "remove output files",
+                hasValue: false
+            }
+        }
+    });
+    if (flags.files.length !== 2) {
+        throw new Error(exports.usage);
+    }
+    const extension = flags.flags.o ? flags.flags.o : ".js";
+    const inputExtension = flags.flags.i ? flags.flags.i : ".sfc";
+    const webComponentsModule = flags.flags.m ? flags.flags.m : "@miqro/web-components";
+    const defineRequireString = extension === ".ts" ?
+        `import {define} from "${webComponentsModule}"` :
+        `import {define} from "${webComponentsModule}";`;
+    const componentRequireString = extension === ".ts" ?
+        `import {FunctionComponentThis} from "${webComponentsModule}"` : "";
+    const sfcDir = (0, path_1.resolve)(process.cwd(), flags.files[0]);
+    const outDir = (0, path_1.resolve)(process.cwd(), flags.files[1]);
+    if (!(0, fs_1.statSync)(sfcDir).isDirectory() || !(0, fs_1.statSync)(outDir).isDirectory()) {
+        throw new Error(exports.usage);
+    }
+    const tE = [];
+    function recursiveDir(folder) {
+        const files = (0, fs_1.readdirSync)(folder);
+        for (const file of files) {
+            const filePath = (0, path_1.resolve)(folder, file);
+            if ((0, fs_1.statSync)(filePath).isDirectory()) {
+                recursiveDir(filePath);
+            }
+            else {
+                if ((0, path_1.extname)(filePath) === inputExtension) {
+                    tE.push(async function () {
+                        try {
+                            const outMainFileName = (0, path_1.basename)(filePath.substring(0, filePath.length - inputExtension.length) + extension);
+                            const outFileName = (0, path_1.basename)(filePath.substring(0, filePath.length - inputExtension.length) + "-component" + extension);
+                            const realOutFileDirname = (0, path_1.resolve)(outDir, (0, path_1.relative)(sfcDir, (0, path_1.dirname)(filePath)));
+                            const realOutFilePath = (0, path_1.resolve)(realOutFileDirname, outFileName);
+                            const realMainOutFilePath = (0, path_1.resolve)(realOutFileDirname, outMainFileName);
+                            if (flags.flags.c !== undefined) {
+                                console.log("%s\n\tremoving %s\n\tremoving %s", filePath, realOutFilePath, realMainOutFilePath);
+                                (0, fs_1.unlinkSync)(realOutFilePath);
+                                (0, fs_1.unlinkSync)(realMainOutFilePath);
+                            }
+                            else {
+                                console.log("%s ->\n\t%s\n\t%s", filePath, realOutFilePath, realMainOutFilePath);
+                                if (!(0, fs_1.existsSync)(realOutFileDirname)) {
+                                    (0, fs_1.mkdirSync)(realOutFileDirname, {
+                                        recursive: true
+                                    });
+                                }
+                                const [jsContent, mainJS] = await compileSFC(filePath, {
+                                    defineRequireString,
+                                    componentRequireString
+                                });
+                                (0, fs_1.writeFileSync)(realOutFilePath, jsContent);
+                                const requireInput = "./" + (0, path_1.relative)((0, path_1.dirname)(realMainOutFilePath), realOutFilePath);
+                                const commonJSANDESM = requireInput.substring(0, requireInput.length - extension.length) + ".js";
+                                (0, fs_1.writeFileSync)(realMainOutFilePath, mainJS(commonJSANDESM));
+                            }
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                    });
+                }
+            }
+        }
+    }
+    recursiveDir(sfcDir);
+    await Promise.allSettled(tE.map(t => t()));
+};
+exports.main = main;
+async function compileSFC(sfcPath, requireStrings, extension = ".js") {
+    const json = await (0, xml_js_1.parseXML2JSON)((0, fs_1.readFileSync)(sfcPath).toString());
+    json.children = json.children.filter((c) => c.name !== "TEXT");
+    if (json.children.length !== 1) {
+        throw new Error("bad sfc structure(0) for " + sfcPath);
+    }
+    json.children[0].children = json.children[0].children.filter((c) => c.name !== "TEXT");
+    if (json.children[0].children.length !== 2) {
+        throw new Error("bad sfc structure(1) for " + sfcPath);
+    }
+    const componentName = json.children[0].name;
+    const componentTemplateTag = json.children[0].children[0];
+    const componentScriptTag = json.children[0].children[1];
+    const dataShadowRootMode = json.children[0].attributes[DATA_SHADOW_ROOT_MODE] ? json.children[0].attributes[DATA_SHADOW_ROOT_MODE] : undefined;
+    let modeArg;
+    switch (dataShadowRootMode) {
+        case "false":
+            modeArg = false;
+            break;
+        case "true":
+        case "close":
+            modeArg = { mode: "closed" };
+            break;
+        case "open":
+            modeArg = { mode: "open" };
+            break;
+    }
+    if (componentTemplateTag.name !== "template" || componentScriptTag.name !== "script") {
+        throw new Error("bad sfc structure(2) for " + sfcPath);
+    }
+    /*console.dir(json, {
+      depth: 10
+    });*/
+    if (componentScriptTag.children.length !== 1 || componentScriptTag.children[0].type !== "text") {
+        throw new Error("bad sfc structure(3) for " + sfcPath);
+    }
+    const scriptText = componentScriptTag.children[0].text;
+    let baseTabulation = null;
+    let startTabulationIndex = 0;
+    const jsContent = scriptText.split("\n").map((l, i) => {
+        const trimmed = l.trim();
+        if (baseTabulation === null && trimmed !== "") {
+            baseTabulation = l.indexOf(trimmed);
+            startTabulationIndex = i;
+            const tabulationSubstring = l.substring(baseTabulation);
+            return tabulationSubstring.trim() !== "" ? tabulationSubstring : l;
+        }
+        else if (baseTabulation !== null) {
+            const tabulationSubstring = l.substring(baseTabulation);
+            return tabulationSubstring.trim() !== "" ? tabulationSubstring : l;
+        }
+        else {
+            return "";
+        }
+    }).join("\n").slice(startTabulationIndex);
+    const template = componentTemplateTag.children.map((tag) => tagToString(tag)).join("");
+    const outFileContent = `${requireStrings.componentRequireString ? `${requireStrings.componentRequireString}\n\n` : ""}${jsContent}`;
+    return [
+        outFileContent,
+        (jsContentPath) => `${requireStrings.defineRequireString ? `${requireStrings.defineRequireString}\n` : ""}` +
+            `import render from "${jsContentPath}";\n\n` +
+            `define("${componentName}", render, ${JSON.stringify({
+                template,
+                ...(dataShadowRootMode === undefined ? {} : {
+                    shadowInit: modeArg
+                })
+            })});`
+    ];
+}
+function getAttributes(tag) {
+    const attributes = Object.keys(tag.attributes);
+    let ret = "";
+    for (const attribute of attributes) {
+        if (ret === "") {
+            ret = `${attribute}="${tag.attributes[attribute]}"`;
+        }
+        else {
+            ret += ` ${attribute}="${tag.attributes[attribute]}"`;
+        }
+    }
+    return ret;
+}
+function tagToString(tag) {
+    if (tag.type === "text") {
+        return tag.text ? tag.text : "";
+    }
+    else if (tag.type === "comment") {
+        return `<!--${tag.text}-->`;
+    }
+    else if (tag.isSelfClosing) {
+        const attrs = getAttributes(tag);
+        return `<${tag.name}${attrs ? ` ${attrs}` : ""}/>`;
+    }
+    else {
+        const attrs = getAttributes(tag);
+        return `<${tag.name}${attrs ? ` ${attrs}` : ""}>${tag.children.map((c) => tagToString(c)).join("\n")}</${tag.name}>`;
+    }
+}

package/dist/utils/index.js

@@ -82,12 +82,12 @@ const mainCMD = (cmds, usage, logger, cmdArg = process.argv[2], exit = true) =>
             logger.info(`Available commands:\n`);
             for (const cmd of Object.keys(cmds)) {
                 if (cmds[cmd].section) {
-                    logger.info(`\n${cmds[cmd].section}\n`);
+                    logger.info(`\n==${cmds[cmd].section}==\n`);
                 }
                 //const description = cmds[cmd].description.split("\n").map(s => `${getTabs(/*cmds[cmd].tabs*/2)}${s}`).join("\n");
                 //const description = cmds[cmd].description.split("\n").map(s => `${getTabs(/*cmds[cmd].tabs*/1)}${s}`).join("\n");
                 const description = cmds[cmd].description.split("\n").map(s => `${getTabs(cmds[cmd].tabs)}${s}`).join("\n");
-                logger.info(`\t${cmd}${description}`);
+                logger.info(`${cmd}${description}`);
                 //logger.info(`${cmd}\n${description}`);
             }
             logger.info("");

package/dist/utils/xml.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseXML2JSON = void 0;
-const { parser } = require("sax");
+const sax_1 = require("sax");
 const parseXML2JSON = async (val) => {
     return new Promise((resolve, reject) => {
         const ret = {
@@ -15,13 +15,13 @@ const parseXML2JSON = async (val) => {
         let current = {
             ref: ret
         };
-        const p = parser(undefined, {
+        const p = (0, sax_1.parser)(false, {
             noscript: true,
-            trim: true
+            lowercase: true
         });
         p.onerror = (e) => {
-            // an error happened.
             console.error(e);
+            reject(e);
         };
         p.oncomment = (c) => {
             if (!current) {
@@ -53,15 +53,17 @@ const parseXML2JSON = async (val) => {
             };
             current.ref.children.push(node);
         };
-        p.onopentag = (node) => {
-            // opened a tag.  node has "name" and "attributes"
-            /*if (node.name.toLocaleLowerCase() === "bpmn:sequenceflow") {
-              console.log("open %o", node);
-            }*/
+        p.onopentag = (t) => {
             if (!current) {
                 console.error("current null");
                 process.exit(1);
             }
+            const node = {
+                ...t,
+                type: "node",
+                text: "",
+                children: []
+            };
             node.type = "node";
             node.text = "";
             node.children = [];
@@ -71,12 +73,10 @@ const parseXML2JSON = async (val) => {
                 ref: node
             };
         };
-        p.onattribute = (attr) => {
-            // console.dir(attr);
-        };
-        p.onclosetag = (node) => {
-            // opened a tag.  node has "name" and "attributes"
-            // console.log("close %s", node);
+        /*p.onattribute = (attr: XMLAttr) => {
+          
+        };*/
+        p.onclosetag = () => {
             if (!current) {
                 console.error("current null");
                 process.exit(1);
@@ -86,8 +86,6 @@ const parseXML2JSON = async (val) => {
             };
         };
         p.onend = () => {
-            // console.log("end");
-            // parser stream is done, and ready to have more stuff written to it.
             resolve(ret);
         };
         p.write(val).close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miqro",
-  "version": "1.8.3",
+  "version": "1.8.6",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,9 @@
     "@miqro/parser": "^0.1.5",
     "@miqro/runner": "^1.2.8",
     "@miqro/test": "^0.2.4",
-    "deep-diff": "1.0.2"
+    "@types/sax": "^1.2.4",
+    "deep-diff": "1.0.2",
+    "sax": "^1.2.4"
   },
   "devDependencies": {
     "@types/cookie": "0.4.1",