jitar 0.3.6 → 0.3.8

package/CHANGELOG.md

@@ -1,7 +1,12 @@
 
 # Changelog
 
-## 0.3.5 (February 26, 2023)
+## 0.3.7 (February 26, 2023)
+
+Fixes:
+- \[[`b9c9db3`](https://github.com/MaskingTechnology/jitar/commit/b9c9db3)] Fixed importing commonJS modules [petermasking](https://github.com/MaskingTechnology/jitar/pull/182)
+
+## 0.3.6 (February 26, 2023)
 
 - Bump dependency for the latest version of jitar-reflection.
 

package/LICENCE

@@ -0,0 +1,23 @@
+
+(The MIT License)
+
+Copyright (c) 2023 Masking Technology B.V. <https://masking.tech>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/runtime/caching/ImportRewriter.js

@@ -1,14 +1,8 @@
+import { Reflector } from 'jitar-reflection';
 import * as Keywords from './definitions/Keywords.js';
 const IMPORT_PATTERN = /import(?:["'\s]*([\w*{}\n, ]+)from\s*)?["'\s]*([@\w/_-]+)["'\s].*/g;
 const NON_SYSTEM_INDICATORS = ['.', '/', 'http:', 'https:'];
-class Dependency {
-    items;
-    from;
-    constructor(items, from) {
-        this.items = items;
-        this.from = from;
-    }
-}
+const reflector = new Reflector();
 export default class ImportRewriter {
     static rewrite(content) {
         const replacer = (statement) => this.#replaceImport(statement);
@@ -18,30 +12,45 @@ export default class ImportRewriter {
             : newContent;
     }
     static #replaceImport(statement) {
-        const dependency = this.#parseImport(statement);
+        const dependency = reflector.parseImport(statement);
         return this.#isSystemDependency(dependency)
             ? this.#rewriteImport(dependency)
             : statement;
     }
-    static #parseImport(statement) {
-        const hasSemicolon = statement.endsWith(';');
-        const fromIndex = statement.indexOf('from');
-        const endIndex = statement.length - (hasSemicolon ? 1 : 0);
-        const items = statement.substring(6, fromIndex).trim();
-        const from = statement.substring(fromIndex + 4, endIndex).trim().slice(1, -1);
-        return new Dependency(items, from);
-    }
     static #isSystemDependency(dependency) {
-        return NON_SYSTEM_INDICATORS.some(indicator => dependency.from.startsWith(indicator)) === false;
+        return NON_SYSTEM_INDICATORS.some(indicator => dependency.from.startsWith(indicator, 1)) === false;
     }
     static #isJitarDependency(dependency) {
-        return dependency.from === Keywords.JITAR;
+        return dependency.from.includes(Keywords.JITAR);
     }
     static #rewriteImport(dependency) {
+        if (dependency.members.length === 0) {
+            return `await getDependency(${dependency.from});`;
+        }
+        const members = this.#rewriteImportMembers(dependency);
         if (this.#isJitarDependency(dependency)) {
-            return `import ${dependency.items} from "/jitar/hooks.js";`;
+            return `import ${members} from "/jitar/hooks.js";`;
         }
-        return `const ${dependency.items} = await getDependency('${dependency.from}');`;
+        return `const ${members} = await getDependency(${dependency.from});`;
+    }
+    static #rewriteImportMembers(dependency) {
+        if (this.#mustUseAs(dependency)) {
+            return dependency.members[0].as;
+        }
+        const members = dependency.members.map(member => member.name !== member.as ? `${member.name}: ${member.as}` : member.name);
+        return `{ ${members.join(', ')} }`;
+    }
+    static #mustUseAs(dependency) {
+        return this.#doesImportAll(dependency)
+            || this.#doesImportDefault(dependency);
+    }
+    static #doesImportAll(dependency) {
+        return dependency.members.length === 1
+            && dependency.members[0].name === '*';
+    }
+    static #doesImportDefault(dependency) {
+        return dependency.members.length === 1
+            && dependency.members[0].name === 'default';
     }
     static #insertGetDependency(module) {
         return `import { getDependency } from "/jitar/hooks.js";\n${module}`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jitar",
-    "version": "0.3.6",
+    "version": "0.3.8",
     "description": "Distributed runtime for JavaScript and TypeScript to chop monolithic applications into micros.",
     "author": "Masking Technology <info@masking.tech> (https://jitar.dev)",
     "license": "MIT",
@@ -21,7 +21,7 @@
         "release": "npm run clean && npm run build && npm publish"
     },
     "dependencies": {
-        "jitar-reflection": "^0.3.6"
+        "jitar-reflection": "^0.3.7"
     },
     "engines": {
         "node": ">=18.7"
@@ -43,5 +43,6 @@
         "monolith",
         "full stack",
         "web applications"
-    ]
-}
+    ],
+    "gitHead": "8eafe79ce9317964f843301bc2fbf6278a4fb88f"
+}