@koine/i18n 2.0.0-beta.166 → 2.0.0-beta.167

package/adapter-js/generators/formatTo.cjs.js

@@ -93,9 +93,7 @@ var t = createAdapter.createGenerator("js", (a)=>{
             ext: "ts",
             index: !1,
             content: ()=>formatTo(t, !0).$out("ts", {
-                    imports: {
-                        folderUp: 0
-                    },
+                    imports: {},
                     exports: "named"
                 })
         }

package/adapter-js/generators/formatTo.esm.js

@@ -89,9 +89,7 @@ var t = createGenerator("js", (a)=>{
             ext: "ts",
             index: !1,
             content: ()=>formatTo(t, !0).$out("ts", {
-                    imports: {
-                        folderUp: 0
-                    },
+                    imports: {},
                     exports: "named"
                 })
         }

package/adapter-js/generators/t.cjs.js

@@ -10,31 +10,31 @@ var imports = require('../../compiler/imports.cjs.js');
 var types = require('./types.cjs.js');
 
 let c = "count";
-function getTFunction(e, r) {
-    let { params: n, plural: o } = e, { body: l, imports: s } = function(e, r) {
-        let { values: n, params: o, plural: l, typeValue: s, equalValues: i } = e, { defaultLocale: m, single: u } = r, y = !u && !i, P = [
+function getTFunction(t, n) {
+    let { params: r, plural: o } = t, { body: i, imports: l } = function(t, n) {
+        let { values: r, params: o, plural: i, typeValue: l, equalValues: p } = t, { defaultLocale: m, single: u } = n, y = !u && !p, h = [
             d.types
         ];
-        return l && P.push(d.tPluralise), o && ("Primitive" === s ? P.push(d.tInterpolateParams) : ("Array" === s || "Object" === s) && P.push(d.tInterpolateParamsDeep)), {
-            imports: P,
-            body: (e)=>{
-                let r = y ? "locale = locale || global." + helpers.GLOBAL_I18N_IDENTIFIER + "; " : "";
-                r += "return ";
-                let i = "";
-                return utils.isPrimitive(n) ? i += f(n, e) : i += function(e, r, n, a) {
+        return i && h.push(d.i18nPluralise), o && ("Primitive" === l ? h.push(d.i18nInterpolateParams) : ("Array" === l || "Object" === l) && h.push(d.i18nInterpolateParamsDeep)), {
+            imports: h,
+            body: (t)=>{
+                let n = y ? "locale = locale || global." + helpers.GLOBAL_I18N_IDENTIFIER + "; " : "";
+                n += "return ";
+                let p = "";
+                return utils.isPrimitive(r) ? p += f(r, t) : p += function(t, n, r, a) {
                     let o = "";
-                    if (n) for(let n in r){
-                        let l = r[n];
-                        n === e || utils.areEqual(l, r[e]) || (o += `locale === "${n}" ? ${f(l, a)} : `);
+                    if (r) for(let r in n){
+                        let i = n[r];
+                        r === t || utils.areEqual(i, n[t]) || (o += `locale === "${r}" ? ${f(i, a)} : `);
                     }
-                    return o + f(r[e], a);
-                }(m, n, y, e), l && (i = `tPluralise(${i}, params.${c})`), o && ("Primitive" === s ? i = `tInterpolateParams(${i}, params)` : ("Array" === s || "Object" === s) && (i = `tInterpolateParamsDeep(${i}, params)`)), r + i;
+                    return o + f(n[t], a);
+                }(m, r, y, t), i && (p = `i18nPluralise(${p}, params.${c})`), o && ("Primitive" === l ? p = `i18nInterpolateParams(${p}, params)` : ("Array" === l || "Object" === l) && (p = `i18nInterpolateParamsDeep(${p}, params)`)), n + p;
             }
         };
-    }(e, r), m = [], u = n ? o ? {
-        ...n,
+    }(t, n), m = [], u = r ? o ? {
+        ...r,
         [c]: "number"
-    } : n : o ? {
+    } : r : o ? {
         [c]: "number"
     } : null;
     return u && m.push({
@@ -49,50 +49,50 @@ function getTFunction(e, r) {
         description: "Use this to override the current locale",
         defaults: "current locale"
     }), {
-        body: l,
+        body: i,
         args: m,
-        imports: s
+        imports: l
     };
 }
-function f(t, { format: a }) {
-    let l = "ts" === a ? " as const" : "";
-    return utils.isString(t) || utils.isNumber(t) ? `"${t}"${l}` : utils.isBoolean(t) ? `${t}` : utils.isArray(t) ? JSON.stringify(t) + l : `(${JSON.stringify(t)}${l})`;
+function f(e, { format: a }) {
+    let i = "ts" === a ? " as const" : "";
+    return utils.isString(e) || utils.isNumber(e) ? `"${e}"${i}` : utils.isBoolean(e) ? `${e}` : utils.isArray(e) ? JSON.stringify(e) + i : `(${JSON.stringify(e)}${i})`;
 }
 let d = {
     types: types.getImportTypes(),
-    tInterpolateParams: new imports.ImportsCompiler({
-        path: "internal/tInterpolateParams",
+    i18nInterpolateParams: new imports.ImportsCompiler({
+        path: "@koine/i18n",
         named: [
             {
-                name: "tInterpolateParams"
+                name: "i18nInterpolateParams"
             }
         ]
     }),
-    tInterpolateParamsDeep: new imports.ImportsCompiler({
-        path: "internal/tInterpolateParamsDeep",
+    i18nInterpolateParamsDeep: new imports.ImportsCompiler({
+        path: "@koine/i18n",
         named: [
             {
-                name: "tInterpolateParamsDeep"
+                name: "i18nInterpolateParamsDeep"
             }
         ]
     }),
-    tPluralise: new imports.ImportsCompiler({
-        path: "internal/tPluralise",
+    i18nPluralise: new imports.ImportsCompiler({
+        path: "@koine/i18n",
         named: [
             {
-                name: "tPluralise"
+                name: "i18nPluralise"
             }
         ]
     })
-}, y = (t, e)=>{
-    let r = [], n = new Set();
-    for(let a in n.add(d.types), t){
-        let o = t[a], { imports: l, args: p, body: i } = getTFunction(o, e);
-        l.forEach((t)=>n.add(t)), r.push(new functions.FunctionsCompiler({
-            imports: l,
+}, y = (e, t)=>{
+    let n = [], r = new Set();
+    for(let a in r.add(d.types), e){
+        let o = e[a], { imports: i, args: s, body: p } = getTFunction(o, t);
+        i.forEach((e)=>r.add(e)), n.push(new functions.FunctionsCompiler({
+            imports: i,
             name: o.fnName,
-            args: p,
-            body: i,
+            args: s,
+            body: p,
             comment: {
                 tags: [
                     {
@@ -104,18 +104,18 @@ let d = {
         }));
     }
     return {
-        functions: r,
-        allImports: n
+        functions: n,
+        allImports: r
     };
 };
-var d$1 = createAdapter.createGenerator("js", (t)=>{
-    let { config: e, options: { translations: r, adapter: { modularize: n } }, translations: a } = t, { dir: o } = r.functions, { functions: l, allImports: p } = y(a, e);
-    return n ? l.reduce((t, e)=>(t[e.name] = {
+var d$1 = createAdapter.createGenerator("js", (e)=>{
+    let { config: t, options: { translations: n, adapter: { modularize: r } }, translations: a } = e, { dir: o } = n.functions, { functions: i, allImports: s } = y(a, t);
+    return r ? i.reduce((e, t)=>(e[t.name] = {
             dir: o,
-            name: e.name,
+            name: t.name,
             ext: "ts",
             index: !0,
-            content: ()=>e.$out("ts", {
+            content: ()=>t.$out("ts", {
                     imports: {
                         folderUp: 1
                     },
@@ -124,14 +124,12 @@ var d$1 = createAdapter.createGenerator("js", (t)=>{
                     comments: !0,
                     pure: !0
                 })
-        }, t), {}) : {
+        }, e), {}) : {
         $t: {
             name: o,
             ext: "ts",
             index: !1,
-            content: ()=>"" + (imports.ImportsCompiler.outMany("ts", p, {
-                    folderUp: 0
-                }) + functions.FunctionsCompiler.outMany("ts", l, {
+            content: ()=>"" + (imports.ImportsCompiler.outMany("ts", s) + functions.FunctionsCompiler.outMany("ts", i, {
                     imports: !1,
                     exports: "named",
                     style: "function",

package/adapter-js/generators/t.esm.js

@@ -6,31 +6,31 @@ import { ImportsCompiler } from '../../compiler/imports.esm.js';
 import { getImportTypes } from './types.esm.js';
 
 let c = "count";
-function getTFunction(e, r) {
-    let { params: n, plural: o } = e, { body: l, imports: s } = function(e, r) {
-        let { values: n, params: o, plural: l, typeValue: s, equalValues: i } = e, { defaultLocale: m, single: u } = r, y = !u && !i, P = [
+function getTFunction(t, n) {
+    let { params: r, plural: o } = t, { body: i, imports: l } = function(t, n) {
+        let { values: r, params: o, plural: i, typeValue: l, equalValues: p } = t, { defaultLocale: m, single: u } = n, y = !u && !p, h = [
             d.types
         ];
-        return l && P.push(d.tPluralise), o && ("Primitive" === s ? P.push(d.tInterpolateParams) : ("Array" === s || "Object" === s) && P.push(d.tInterpolateParamsDeep)), {
-            imports: P,
-            body: (e)=>{
-                let r = y ? "locale = locale || global." + GLOBAL_I18N_IDENTIFIER + "; " : "";
-                r += "return ";
-                let i = "";
-                return isPrimitive(n) ? i += f(n, e) : i += function(e, r, n, a) {
+        return i && h.push(d.i18nPluralise), o && ("Primitive" === l ? h.push(d.i18nInterpolateParams) : ("Array" === l || "Object" === l) && h.push(d.i18nInterpolateParamsDeep)), {
+            imports: h,
+            body: (t)=>{
+                let n = y ? "locale = locale || global." + GLOBAL_I18N_IDENTIFIER + "; " : "";
+                n += "return ";
+                let p = "";
+                return isPrimitive(r) ? p += f(r, t) : p += function(t, n, r, a) {
                     let o = "";
-                    if (n) for(let n in r){
-                        let l = r[n];
-                        n === e || areEqual(l, r[e]) || (o += `locale === "${n}" ? ${f(l, a)} : `);
+                    if (r) for(let r in n){
+                        let i = n[r];
+                        r === t || areEqual(i, n[t]) || (o += `locale === "${r}" ? ${f(i, a)} : `);
                     }
-                    return o + f(r[e], a);
-                }(m, n, y, e), l && (i = `tPluralise(${i}, params.${c})`), o && ("Primitive" === s ? i = `tInterpolateParams(${i}, params)` : ("Array" === s || "Object" === s) && (i = `tInterpolateParamsDeep(${i}, params)`)), r + i;
+                    return o + f(n[t], a);
+                }(m, r, y, t), i && (p = `i18nPluralise(${p}, params.${c})`), o && ("Primitive" === l ? p = `i18nInterpolateParams(${p}, params)` : ("Array" === l || "Object" === l) && (p = `i18nInterpolateParamsDeep(${p}, params)`)), n + p;
             }
         };
-    }(e, r), m = [], u = n ? o ? {
-        ...n,
+    }(t, n), m = [], u = r ? o ? {
+        ...r,
         [c]: "number"
-    } : n : o ? {
+    } : r : o ? {
         [c]: "number"
     } : null;
     return u && m.push({
@@ -45,50 +45,50 @@ function getTFunction(e, r) {
         description: "Use this to override the current locale",
         defaults: "current locale"
     }), {
-        body: l,
+        body: i,
         args: m,
-        imports: s
+        imports: l
     };
 }
-function f(t, { format: a }) {
-    let l = "ts" === a ? " as const" : "";
-    return isString(t) || isNumber(t) ? `"${t}"${l}` : isBoolean(t) ? `${t}` : isArray(t) ? JSON.stringify(t) + l : `(${JSON.stringify(t)}${l})`;
+function f(e, { format: a }) {
+    let i = "ts" === a ? " as const" : "";
+    return isString(e) || isNumber(e) ? `"${e}"${i}` : isBoolean(e) ? `${e}` : isArray(e) ? JSON.stringify(e) + i : `(${JSON.stringify(e)}${i})`;
 }
 let d = {
     types: getImportTypes(),
-    tInterpolateParams: new ImportsCompiler({
-        path: "internal/tInterpolateParams",
+    i18nInterpolateParams: new ImportsCompiler({
+        path: "@koine/i18n",
         named: [
             {
-                name: "tInterpolateParams"
+                name: "i18nInterpolateParams"
             }
         ]
     }),
-    tInterpolateParamsDeep: new ImportsCompiler({
-        path: "internal/tInterpolateParamsDeep",
+    i18nInterpolateParamsDeep: new ImportsCompiler({
+        path: "@koine/i18n",
         named: [
             {
-                name: "tInterpolateParamsDeep"
+                name: "i18nInterpolateParamsDeep"
             }
         ]
     }),
-    tPluralise: new ImportsCompiler({
-        path: "internal/tPluralise",
+    i18nPluralise: new ImportsCompiler({
+        path: "@koine/i18n",
         named: [
             {
-                name: "tPluralise"
+                name: "i18nPluralise"
             }
         ]
     })
-}, y = (t, e)=>{
-    let r = [], n = new Set();
-    for(let a in n.add(d.types), t){
-        let o = t[a], { imports: l, args: p, body: i } = getTFunction(o, e);
-        l.forEach((t)=>n.add(t)), r.push(new FunctionsCompiler({
-            imports: l,
+}, y = (e, t)=>{
+    let n = [], r = new Set();
+    for(let a in r.add(d.types), e){
+        let o = e[a], { imports: i, args: s, body: p } = getTFunction(o, t);
+        i.forEach((e)=>r.add(e)), n.push(new FunctionsCompiler({
+            imports: i,
             name: o.fnName,
-            args: p,
-            body: i,
+            args: s,
+            body: p,
             comment: {
                 tags: [
                     {
@@ -100,18 +100,18 @@ let d = {
         }));
     }
     return {
-        functions: r,
-        allImports: n
+        functions: n,
+        allImports: r
     };
 };
-var d$1 = createGenerator("js", (t)=>{
-    let { config: e, options: { translations: r, adapter: { modularize: n } }, translations: a } = t, { dir: o } = r.functions, { functions: l, allImports: p } = y(a, e);
-    return n ? l.reduce((t, e)=>(t[e.name] = {
+var d$1 = createGenerator("js", (e)=>{
+    let { config: t, options: { translations: n, adapter: { modularize: r } }, translations: a } = e, { dir: o } = n.functions, { functions: i, allImports: s } = y(a, t);
+    return r ? i.reduce((e, t)=>(e[t.name] = {
             dir: o,
-            name: e.name,
+            name: t.name,
             ext: "ts",
             index: !0,
-            content: ()=>e.$out("ts", {
+            content: ()=>t.$out("ts", {
                     imports: {
                         folderUp: 1
                     },
@@ -120,14 +120,12 @@ var d$1 = createGenerator("js", (t)=>{
                     comments: !0,
                     pure: !0
                 })
-        }, t), {}) : {
+        }, e), {}) : {
         $t: {
             name: o,
             ext: "ts",
             index: !1,
-            content: ()=>"" + (ImportsCompiler.outMany("ts", p, {
-                    folderUp: 0
-                }) + FunctionsCompiler.outMany("ts", l, {
+            content: ()=>"" + (ImportsCompiler.outMany("ts", s) + FunctionsCompiler.outMany("ts", i, {
                     imports: !1,
                     exports: "named",
                     style: "function",

package/adapter-js/generators/tInterpolateParamsDeep.cjs.js

@@ -52,9 +52,7 @@ var u = createAdapter.createGenerator("js", (a)=>({
             index: !1,
             disabled: !0,
             content: ()=>tInterpolateParamsDeep().$out("ts", {
-                    imports: {
-                        folderUp: 0
-                    },
+                    imports: {},
                     exports: "named",
                     style: "function"
                 })

package/adapter-js/generators/tInterpolateParamsDeep.esm.js

@@ -48,9 +48,7 @@ var u = createGenerator("js", (a)=>({
             index: !1,
             disabled: !0,
             content: ()=>tInterpolateParamsDeep().$out("ts", {
-                    imports: {
-                        folderUp: 0
-                    },
+                    imports: {},
                     exports: "named",
                     style: "function"
                 })

package/adapter-js/generators/tPluralise.cjs.js

@@ -44,9 +44,7 @@ var T = createAdapter.createGenerator("js", (t)=>({
             ext: "ts",
             index: !1,
             content: ()=>tPluralise().$out("ts", {
-                    imports: {
-                        folderUp: 0
-                    },
+                    imports: {},
                     exports: "named"
                 })
         }

package/adapter-js/generators/tPluralise.esm.js

@@ -40,9 +40,7 @@ var T = createGenerator("js", (t)=>({
             ext: "ts",
             index: !1,
             content: ()=>tPluralise().$out("ts", {
-                    imports: {
-                        folderUp: 0
-                    },
+                    imports: {},
                     exports: "named"
                 })
         }

package/adapter-js/generators/to.cjs.js

@@ -103,9 +103,7 @@ var I = createAdapter.createGenerator("js", (t)=>{
                     name: i,
                     ext: "ts",
                     index: !1,
-                    content: ()=>"" + (imports.ImportsCompiler.outMany("ts", d, {
-                            folderUp: 0
-                        }) + functions.FunctionsCompiler.outMany("ts", u, {
+                    content: ()=>"" + (imports.ImportsCompiler.outMany("ts", d) + functions.FunctionsCompiler.outMany("ts", u, {
                             imports: !1,
                             exports: "named",
                             style: "function",

package/adapter-js/generators/to.esm.js

@@ -99,9 +99,7 @@ var I = createGenerator("js", (t)=>{
                     name: i,
                     ext: "ts",
                     index: !1,
-                    content: ()=>"" + (ImportsCompiler.outMany("ts", d, {
-                            folderUp: 0
-                        }) + FunctionsCompiler.outMany("ts", u, {
+                    content: ()=>"" + (ImportsCompiler.outMany("ts", d) + FunctionsCompiler.outMany("ts", u, {
                             imports: !1,
                             exports: "named",
                             style: "function",

package/compiler/functions.d.ts

@@ -125,7 +125,7 @@ type FunctionsCompilerComment = {
      */
     tags?: FunctionsCompilerCommentTag[];
 };
-type FunctionsCompilerOutputOptions = {
+export type FunctionsCompilerOutputOptions = {
     /**
      * Imports output options, pass `false` to do not output import' statements
      */

package/compiler/helpers.cjs.js

@@ -1,30 +1,31 @@
 'use strict';
 
 var minimatch = require('minimatch');
+var imports = require('./imports.cjs.js');
 
 const GLOBAL_I18N_IDENTIFIER = "__i18n_locale";
-let getImportDots = (t = 0)=>(t ? Array(t).fill("..").join("/") : ".") + "/";
-let getTranslationsDir = (t = 0, e = "translations")=>getImportDots(t) + e;
-let compileDataParamsToType = (t)=>"{ " + Object.keys(t).reduce((e, r)=>{
-        let a = t[r], o = "";
+let getTranslationsDir = (e = 0, r = "translations")=>imports.ImportsCompiler.getDir({
+        folderUp: e
+    }) + r;
+let compileDataParamsToType = (e)=>"{ " + Object.keys(e).reduce((t, r)=>{
+        let a = e[r], i = "";
         switch(a){
             case "number":
-                o = "number";
+                i = "number";
                 break;
             case "string":
-                o = "string";
+                i = "string";
                 break;
             default:
-                o = "string | number";
+                i = "string | number";
         }
-        return e.push(`${r}: ${o};`), e;
+        return t.push(`${r}: ${i};`), t;
     }, []).join(" ") + " }";
-let escapeEachChar = (t)=>t.split("").map((t)=>`\\${t}`).join("");
-let filterInputTranslationFiles = (e, r = [], a)=>e.filter((e)=>(!a || a && a(e)) && (!r.length || r.every((r)=>!minimatch.minimatch(e.path, r))));
+let escapeEachChar = (e)=>e.split("").map((e)=>`\\${e}`).join("");
+let filterInputTranslationFiles = (t, r = [], a)=>t.filter((t)=>(!a || a && a(t)) && (!r.length || r.every((r)=>!minimatch.minimatch(t.path, r))));
 
 exports.GLOBAL_I18N_IDENTIFIER = GLOBAL_I18N_IDENTIFIER;
 exports.compileDataParamsToType = compileDataParamsToType;
 exports.escapeEachChar = escapeEachChar;
 exports.filterInputTranslationFiles = filterInputTranslationFiles;
-exports.getImportDots = getImportDots;
 exports.getTranslationsDir = getTranslationsDir;

package/compiler/helpers.d.ts

@@ -1,6 +1,5 @@
 import type { I18nCompiler } from "./types";
 export declare const GLOBAL_I18N_IDENTIFIER = "__i18n_locale";
-export declare let getImportDots: (folderUp?: number) => string;
 /**
  * TODO: maybe make this folder name or path configurable through options
  *

package/compiler/helpers.esm.js

@@ -1,23 +1,25 @@
 import { minimatch } from 'minimatch';
+import { ImportsCompiler } from './imports.esm.js';
 
 const GLOBAL_I18N_IDENTIFIER = "__i18n_locale";
-let getImportDots = (t = 0)=>(t ? Array(t).fill("..").join("/") : ".") + "/";
-let getTranslationsDir = (t = 0, e = "translations")=>getImportDots(t) + e;
-let compileDataParamsToType = (t)=>"{ " + Object.keys(t).reduce((e, r)=>{
-        let a = t[r], o = "";
+let getTranslationsDir = (e = 0, r = "translations")=>ImportsCompiler.getDir({
+        folderUp: e
+    }) + r;
+let compileDataParamsToType = (e)=>"{ " + Object.keys(e).reduce((t, r)=>{
+        let a = e[r], i = "";
         switch(a){
             case "number":
-                o = "number";
+                i = "number";
                 break;
             case "string":
-                o = "string";
+                i = "string";
                 break;
             default:
-                o = "string | number";
+                i = "string | number";
         }
-        return e.push(`${r}: ${o};`), e;
+        return t.push(`${r}: ${i};`), t;
     }, []).join(" ") + " }";
-let escapeEachChar = (t)=>t.split("").map((t)=>`\\${t}`).join("");
-let filterInputTranslationFiles = (e, r = [], a)=>e.filter((e)=>(!a || a && a(e)) && (!r.length || r.every((r)=>!minimatch(e.path, r))));
+let escapeEachChar = (e)=>e.split("").map((e)=>`\\${e}`).join("");
+let filterInputTranslationFiles = (t, r = [], a)=>t.filter((t)=>(!a || a && a(t)) && (!r.length || r.every((r)=>!minimatch(t.path, r))));
 
-export { GLOBAL_I18N_IDENTIFIER, compileDataParamsToType, escapeEachChar, filterInputTranslationFiles, getImportDots, getTranslationsDir };
+export { GLOBAL_I18N_IDENTIFIER, compileDataParamsToType, escapeEachChar, filterInputTranslationFiles, getTranslationsDir };

package/compiler/imports.cjs.js

@@ -1,28 +1,69 @@
 'use strict';
 
-var helpers = require('./helpers.cjs.js');
-
 class ImportsCompiler {
     constructor(t){
         this.data = t;
     }
-    static #t(r, e) {
-        let { path: s, defaulT: o, named: n = [] } = r, { folderUp: i } = e, a = helpers.getImportDots(i), m = "import ";
-        return o && (m += o, n.length && (m += ", ")), n.length && (m += "{ " + n.map(({ name: t, type: r })=>r ? "type " + t : t).join(", ") + " }"), m += ' from "' + a + s + '";';
+    static #t(t) {
+        let r = t.reduce((t, r)=>{
+            let { path: e } = r.data;
+            return t[e] = t[e] || [], t[e].push(r), t;
+        }, {});
+        return Object.keys(r).map((t)=>{
+            let e = r[t];
+            if (e.length > 1) {
+                let r = [], i = "";
+                return e.forEach((t)=>{
+                    let { defaulT: e, named: s } = t.data;
+                    if (s && (r = [
+                        ...r,
+                        ...s
+                    ]), e) {
+                        if (i) throw Error(`ImportsCompiler: Aggregated imports declare multiple default imports. Default import "${e}" conflicts with "${i}"`);
+                        i = e;
+                    }
+                }), new ImportsCompiler({
+                    defaulT: i,
+                    named: r,
+                    path: t
+                });
+            }
+            return e[0];
+        });
+    }
+    static getDir(t) {
+        let { folderUp: r = 0, external: e } = t;
+        return e ? "" : (r ? Array(r).fill("..").join("/") : ".") + "/";
+    }
+    static #r(t) {
+        let { path: r, external: e } = t;
+        return "boolean" == typeof e ? e : r.startsWith("@");
+    }
+    static #e(t, r) {
+        let { path: e, defaulT: i, named: s = [] } = t, { folderUp: a } = r || {}, o = this.getDir({
+            folderUp: a,
+            external: this.#r(t)
+        }), n = "import ";
+        return i && (n += i, s.length && (n += ", ")), s.length && (n += "{ " + s.map(({ name: t, type: r })=>r ? "type " + t : t).join(", ") + " }"), n += ' from "' + o + e + '";';
     }
-    static #r(r, e) {
-        let { path: s, defaulT: o, named: n = [] } = r, { folderUp: i } = e, a = helpers.getImportDots(i), m = `= require("${a + s}")`, p = "";
-        return o && (p += `const ${o} ${m};`), n.length && (o && (p += "\n"), p += `const { ${n.filter((t)=>!t.type).map((t)=>t.name).join(", ")} } ${m};`), p;
+    static #i(t, r) {
+        let { path: e, defaulT: i, named: s = [] } = t, { folderUp: a } = r || {}, o = this.getDir({
+            folderUp: a,
+            external: this.#r(t)
+        }), n = `= require("${o + e}")`, l = "";
+        return i && (l += `const ${i} ${n};`), s.length && (i && (l += "\n"), l += `const { ${s.filter((t)=>!t.type).map((t)=>t.name).join(", ")} } ${n};`), l;
     }
     $out(t, r) {
         return ImportsCompiler.out(this.data, t, r);
     }
     static out(t, r, e) {
-        return "ts" === r ? this.#t(t, e) : "cjs" === r ? this.#r(t, e) : "";
+        if ("ts" === r) return this.#e(t, e);
+        if ("cjs" === r) return this.#i(t, e);
+        throw Error(`ImportsCompiler: Unsupported format '${r}'`);
     }
     static outMany(t, r, e) {
-        let s = Array.from(r);
-        return s.length ? s.map((r)=>this.out(r.data, t, e)).join("\n") + "\n\n" : "";
+        let i = this.#t(Array.from(r));
+        return i.length ? i.map((r)=>this.out(r.data, t, e)).join("\n") + "\n\n" : "";
     }
 }
 

package/compiler/imports.d.ts

@@ -3,6 +3,11 @@ export type ImportsCompilerData = {
      * `myPath` in `import type { MyType } from "../myPath"`;
      */
     path: string;
+    /**
+     * Flags an import from a thirdy part package. This is not needed when the path
+     * begins with a `@`, in the other cases we cannot infer this information.
+     */
+    external?: boolean;
     /**
      * `myImport` in `import myImport from "../myPath"`;
      *  or in `import myImport, { myNamed } from "../myPath"`;
@@ -27,15 +32,19 @@ export type ImportsCompilerOutputOptions = {
     /**
      * Determines the `../` in `import type { MyType } from "../myPath"`;
      */
-    folderUp: number;
+    folderUp?: number;
 };
 type ImportsCompilerOutputFormat = "ts" | "cjs";
 export declare class ImportsCompiler {
     #private;
     data: ImportsCompilerData;
     constructor(data: ImportsCompilerData);
-    $out(format: ImportsCompilerOutputFormat, options: ImportsCompilerOutputOptions): string;
-    static out(data: ImportsCompilerData, format: ImportsCompilerOutputFormat, options: ImportsCompilerOutputOptions): string;
-    static outMany(format: ImportsCompilerOutputFormat, instances: ImportsCompiler[] | Set<ImportsCompiler>, options: ImportsCompilerOutputOptions): string;
+    static getDir(options: {
+        folderUp?: number;
+        external?: boolean;
+    }): string;
+    $out(format: ImportsCompilerOutputFormat, options?: ImportsCompilerOutputOptions): string;
+    static out(data: ImportsCompilerData, format: ImportsCompilerOutputFormat, options?: ImportsCompilerOutputOptions): string;
+    static outMany(format: ImportsCompilerOutputFormat, instances: ImportsCompiler[] | Set<ImportsCompiler>, options?: ImportsCompilerOutputOptions): string;
 }
 export {};

package/compiler/imports.esm.js

@@ -1,26 +1,67 @@
-import { getImportDots } from './helpers.esm.js';
-
 class ImportsCompiler {
     constructor(t){
         this.data = t;
     }
-    static #t(r, e) {
-        let { path: s, defaulT: o, named: n = [] } = r, { folderUp: i } = e, a = getImportDots(i), m = "import ";
-        return o && (m += o, n.length && (m += ", ")), n.length && (m += "{ " + n.map(({ name: t, type: r })=>r ? "type " + t : t).join(", ") + " }"), m += ' from "' + a + s + '";';
+    static #t(t) {
+        let r = t.reduce((t, r)=>{
+            let { path: e } = r.data;
+            return t[e] = t[e] || [], t[e].push(r), t;
+        }, {});
+        return Object.keys(r).map((t)=>{
+            let e = r[t];
+            if (e.length > 1) {
+                let r = [], i = "";
+                return e.forEach((t)=>{
+                    let { defaulT: e, named: s } = t.data;
+                    if (s && (r = [
+                        ...r,
+                        ...s
+                    ]), e) {
+                        if (i) throw Error(`ImportsCompiler: Aggregated imports declare multiple default imports. Default import "${e}" conflicts with "${i}"`);
+                        i = e;
+                    }
+                }), new ImportsCompiler({
+                    defaulT: i,
+                    named: r,
+                    path: t
+                });
+            }
+            return e[0];
+        });
+    }
+    static getDir(t) {
+        let { folderUp: r = 0, external: e } = t;
+        return e ? "" : (r ? Array(r).fill("..").join("/") : ".") + "/";
+    }
+    static #r(t) {
+        let { path: r, external: e } = t;
+        return "boolean" == typeof e ? e : r.startsWith("@");
+    }
+    static #e(t, r) {
+        let { path: e, defaulT: i, named: s = [] } = t, { folderUp: a } = r || {}, o = this.getDir({
+            folderUp: a,
+            external: this.#r(t)
+        }), n = "import ";
+        return i && (n += i, s.length && (n += ", ")), s.length && (n += "{ " + s.map(({ name: t, type: r })=>r ? "type " + t : t).join(", ") + " }"), n += ' from "' + o + e + '";';
     }
-    static #r(r, e) {
-        let { path: s, defaulT: o, named: n = [] } = r, { folderUp: i } = e, a = getImportDots(i), m = `= require("${a + s}")`, p = "";
-        return o && (p += `const ${o} ${m};`), n.length && (o && (p += "\n"), p += `const { ${n.filter((t)=>!t.type).map((t)=>t.name).join(", ")} } ${m};`), p;
+    static #i(t, r) {
+        let { path: e, defaulT: i, named: s = [] } = t, { folderUp: a } = r || {}, o = this.getDir({
+            folderUp: a,
+            external: this.#r(t)
+        }), n = `= require("${o + e}")`, l = "";
+        return i && (l += `const ${i} ${n};`), s.length && (i && (l += "\n"), l += `const { ${s.filter((t)=>!t.type).map((t)=>t.name).join(", ")} } ${n};`), l;
     }
     $out(t, r) {
         return ImportsCompiler.out(this.data, t, r);
     }
     static out(t, r, e) {
-        return "ts" === r ? this.#t(t, e) : "cjs" === r ? this.#r(t, e) : "";
+        if ("ts" === r) return this.#e(t, e);
+        if ("cjs" === r) return this.#i(t, e);
+        throw Error(`ImportsCompiler: Unsupported format '${r}'`);
     }
     static outMany(t, r, e) {
-        let s = Array.from(r);
-        return s.length ? s.map((r)=>this.out(r.data, t, e)).join("\n") + "\n\n" : "";
+        let i = this.#t(Array.from(r));
+        return i.length ? i.map((r)=>this.out(r.data, t, e)).join("\n") + "\n\n" : "";
     }
 }
 

package/package.json

@@ -5,8 +5,8 @@
     "node": "^14.18.0 || >=16.0.0"
   },
   "dependencies": {
-    "@koine/node": "2.0.0-beta.166",
-    "@koine/utils": "2.0.0-beta.166",
+    "@koine/node": "2.0.0-beta.167",
+    "@koine/utils": "2.0.0-beta.167",
     "comment-json": "^4.2.4",
     "consola": "^3.2.3",
     "glob": "^11.0.0",
@@ -98,5 +98,5 @@
   "module": "./index.esm.js",
   "main": "./index.cjs.js",
   "types": "./index.esm.d.ts",
-  "version": "2.0.0-beta.166"
+  "version": "2.0.0-beta.167"
 }