@koine/i18n 2.0.0-beta.30 → 2.0.0-beta.32

package/{i18nGenerateSummary.d.ts → generate/generateSummary.d.ts}

@@ -21,7 +21,7 @@ type I18nSummaryFile = {
     words: number;
     characters: number;
 };
-export declare function i18nGenerateSummary(options: I18nGenerateSummaryOptions): Promise<{
+export declare function generateSummary(options: I18nGenerateSummaryOptions): Promise<{
     data: I18nSummary;
     md: string;
 }>;

package/{i18nGenerateSummary.js → generate/generateSummary.js}

@@ -20,42 +20,47 @@ function getWords(value, options) {
     }
     return out;
 }
-function i18nSummaryGetDataEntry(options, file) {
+function getSummaryDataEntry(options, file) {
     var locale = file.locale, path = file.path;
     var url = "".concat(options.sourceUrl, "/").concat(locale, "/").concat(path);
     var words = getWords(file.data);
     var wordsCount = words.split(" ").filter(Boolean).length;
     var characters = words.split(" ").filter(Boolean).join("").length;
     return {
+        characters: characters,
         locale: locale,
         path: path,
         url: url,
         words: wordsCount,
-        characters: characters,
     };
 }
-function i18nSummaryGetData(options) {
+function getSummaryData(options) {
     var files = options.files, defaultLocale = options.defaultLocale;
     var data = {};
     for (var i = 0; i < files.length; i++) {
         var file = files[i];
         var locale = file.locale;
-        var entry = i18nSummaryGetDataEntry(options, file);
+        var entry = getSummaryDataEntry(options, file);
         data[locale] = data[locale] || {};
         data[locale].files = data[locale].files || [];
         data[locale].files.push(entry);
     }
-    data = Object.fromEntries(Object.entries(data).sort(function (_a) {
-        var _b = __read(_a, 1), a = _b[0];
-        return a === defaultLocale ? -1 : 1;
+    data = Object.fromEntries(Object.entries(data).sort(function (_a, _b) {
+        var _c = __read(_a, 1), a = _c[0];
+        var _d = __read(_b, 1), b = _d[0];
+        return a === defaultLocale ? -1 : a.localeCompare(b);
     }));
     forin(data, function (locale, dataPerLocale) {
-        data[locale].words = arraySum(dataPerLocale.files.map(function (f) { return f.words; }));
         data[locale].characters = arraySum(dataPerLocale.files.map(function (f) { return f.characters; }));
+        data[locale].files = data[locale].files.sort(function (a, b) {
+            return a.path.localeCompare(b.path);
+        });
+        data[locale].words = arraySum(dataPerLocale.files.map(function (f) { return f.words; }));
+        data[locale] = Object.fromEntries(Object.entries(data[locale]).sort());
     });
     return data;
 }
-function i18nSummaryGetDataByPath(data) {
+function getSummaryDataByPath(data) {
     var out = {};
     forin(data, function (locale, dataPerLocale) {
         var files = dataPerLocale.files;
@@ -69,8 +74,8 @@ function i18nSummaryGetDataByPath(data) {
     out = Object.fromEntries(Object.entries(out).sort());
     return out;
 }
-function i18nGenerateSummaryMarkdownByPath(_options, data) {
-    var dataByPath = i18nSummaryGetDataByPath(data);
+function generateSummaryMarkdownByPath(_options, data) {
+    var dataByPath = getSummaryDataByPath(data);
     var output = "";
     var body = "";
     var locales = [];
@@ -90,11 +95,13 @@ function i18nGenerateSummaryMarkdownByPath(_options, data) {
     });
     output += "<table><thead><tr>";
     output += "<th ".concat(styleBorder, ">file path</th>");
-    output += locales.map(function () { return "<th>lang</th><th>words</th><th ".concat(styleBorder, ">chars</th>"); });
+    output += locales
+        .map(function () { return "<th>lang</th><th>words</th><th ".concat(styleBorder, ">chars</th>"); })
+        .join("");
     output += "</tr></thead><tbody>".concat(body, "</tbody></table>\n");
     return output;
 }
-function i18nGenerateSummaryMarkdownByLocale(options, data) {
+function generateSummaryMarkdownByLocale(options, data) {
     var output = "";
     var body = "";
     forin(data, function (locale, dataPerLocale) {
@@ -112,20 +119,20 @@ function i18nGenerateSummaryMarkdownByLocale(options, data) {
     output += "</tr></thead><tbody>".concat(body, "</tbody></table>\n");
     return output;
 }
-function i18nGenerateSummaryMarkdown(options, data) {
+function generateSummaryMarkdown(options, data) {
     var output = "# Summary\n";
     output += "\n### By locale\n\n";
-    output += i18nGenerateSummaryMarkdownByLocale(options, data);
+    output += generateSummaryMarkdownByLocale(options, data);
     output += "\n### By file path\n\n";
-    output += i18nGenerateSummaryMarkdownByPath(options, data);
+    output += generateSummaryMarkdownByPath(options, data);
     return output;
 }
-export function i18nGenerateSummary(options) {
+export function generateSummary(options) {
     return __awaiter(this, void 0, void 0, function () {
         var data, md;
         return __generator(this, function (_a) {
-            data = i18nSummaryGetData(options);
-            md = i18nGenerateSummaryMarkdown(options, data);
+            data = getSummaryData(options);
+            md = generateSummaryMarkdown(options, data);
             return [2, { data: data, md: md }];
         });
     });

package/{i18nGenerateTypes.d.ts → generate/generateTypes.d.ts}

@@ -1,5 +1,5 @@
 import type { I18nIndexedFile } from "./types.js";
-export declare function i18nGenerateTypes(options: {
+export declare function generateTypes(options: {
     defaultLocale: string;
     files: I18nIndexedFile[];
 }): Promise<string>;

package/{i18nGenerateTypes.js → generate/generateTypes.js}

@@ -99,7 +99,7 @@ function getType(value) {
     out = out.replace(/;+/g, ";");
     return out;
 }
-export function i18nGenerateTypes(options) {
+export function generateTypes(options) {
     return __awaiter(this, void 0, void 0, function () {
         var defaultLocale, files, defaultLocaleFiles, header, footer, out, i, _a, path, data, namespace, format;
         return __generator(this, function (_b) {

package/{i18nGetFsData.d.ts → generate/getFsData.d.ts}

@@ -3,7 +3,7 @@ type I18nGetFsDataOutput = {
     locales: I18nIndexedLocale[];
     files: I18nIndexedFile[];
 };
-export declare function i18nGetFsData(options: {
+export declare function getFsData(options: {
     cwd: string;
     onlyFilesForLocales?: string[];
 }): Promise<I18nGetFsDataOutput>;

package/{i18nGetFsData.js → generate/getFsData.js}

@@ -2,8 +2,8 @@ import { __awaiter, __generator } from "tslib";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { glob } from "glob";
-import { i18nGetLocalesFolders } from "./i18nGetLocalesFolders.js";
-export function i18nGetFsData(options) {
+import { getLocalesFolders } from "./getLocalesFolders.js";
+export function getFsData(options) {
     return __awaiter(this, void 0, void 0, function () {
         var cwd, _a, onlyFilesForLocales, locales, dataOutput;
         var _this = this;
@@ -11,7 +11,7 @@ export function i18nGetFsData(options) {
             switch (_b.label) {
                 case 0:
                     cwd = options.cwd, _a = options.onlyFilesForLocales, onlyFilesForLocales = _a === void 0 ? [] : _a;
-                    return [4, i18nGetLocalesFolders({ cwd: cwd })];
+                    return [4, getLocalesFolders({ cwd: cwd })];
                 case 1:
                     locales = _b.sent();
                     dataOutput = { locales: locales, files: [] };

package/{i18nGetLocalesFolders.d.ts → generate/getLocalesFolders.d.ts}

@@ -1,4 +1,4 @@
 import type { I18nIndexedLocale } from "./types.js";
-export declare function i18nGetLocalesFolders(options: {
+export declare function getLocalesFolders(options: {
     cwd: string;
 }): Promise<I18nIndexedLocale[]>;

package/{i18nGetLocalesFolders.js → generate/getLocalesFolders.js}

@@ -2,7 +2,7 @@ import { __awaiter, __generator } from "tslib";
 import { join } from "node:path";
 import { glob } from "glob";
 var ignoredFolderNames = ["node_modules"];
-export function i18nGetLocalesFolders(options) {
+export function getLocalesFolders(options) {
     return __awaiter(this, void 0, void 0, function () {
         var cwd, folders, output;
         return __generator(this, function (_a) {

package/generate/index.d.ts

@@ -0,0 +1,7 @@
+export { generateSummary } from "./generateSummary.js";
+export { generateTypes } from "./generateTypes.js";
+export { getFsData } from "./getFsData.js";
+export { getLocalesFolders } from "./getLocalesFolders.js";
+export { writeTypes } from "./writeTypes.js";
+export { writeSummary } from "./writeSummary.js";
+export * from "./types.js";

package/generate/index.js

@@ -0,0 +1,7 @@
+export { generateSummary } from "./generateSummary.js";
+export { generateTypes } from "./generateTypes.js";
+export { getFsData } from "./getFsData.js";
+export { getLocalesFolders } from "./getLocalesFolders.js";
+export { writeTypes } from "./writeTypes.js";
+export { writeSummary } from "./writeSummary.js";
+export * from "./types.js";

package/generate/types.d.ts

@@ -0,0 +1,14 @@
+export type I18nLocale = string & {
+    branded: true;
+};
+export type I18nIndexedFile = {
+    path: string;
+    locale: I18nLocale;
+    data: {
+        [key: string]: any;
+    };
+};
+export type I18nIndexedLocale = {
+    path: string;
+    code: I18nLocale;
+};

package/generate/types.js

@@ -0,0 +1 @@
+export {};

package/{i18nWriteSummary.d.ts → generate/writeSummary.d.ts}

@@ -1,5 +1,5 @@
-import { type I18nGenerateSummaryConfig } from "./i18nGenerateSummary.js";
-export declare function i18nWriteSummary(options: {
+import { type I18nGenerateSummaryConfig } from "./generateSummary.js";
+export declare function writeSummary(options: {
     cwd: string;
     outputJson: string;
     outputMarkdown: string;

package/{i18nWriteSummary.js → generate/writeSummary.js}

@@ -1,21 +1,21 @@
 import { __awaiter, __generator } from "tslib";
 import { join } from "node:path";
 import { fsWrite } from "@koine/node";
-import { i18nGenerateSummary, } from "./i18nGenerateSummary.js";
-import { i18nGetFsData } from "./i18nGetFsData.js";
-export function i18nWriteSummary(options) {
+import { generateSummary, } from "./generateSummary.js";
+import { getFsData } from "./getFsData.js";
+export function writeSummary(options) {
     return __awaiter(this, void 0, void 0, function () {
         var cwd, defaultLocale, outputJson, outputMarkdown, sourceUrl, data, summary;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     cwd = options.cwd, defaultLocale = options.defaultLocale, outputJson = options.outputJson, outputMarkdown = options.outputMarkdown, sourceUrl = options.sourceUrl;
-                    return [4, i18nGetFsData({
+                    return [4, getFsData({
                             cwd: cwd,
                         })];
                 case 1:
                     data = _a.sent();
-                    return [4, i18nGenerateSummary({
+                    return [4, generateSummary({
                             files: data.files,
                             defaultLocale: defaultLocale,
                             sourceUrl: sourceUrl,

package/{i18nWriteTypes.d.ts → generate/writeTypes.d.ts}

@@ -1,4 +1,4 @@
-export declare function i18nWriteTypes(options: {
+export declare function writeTypes(options: {
     cwd: string;
     defaultLocale: string;
     outputTypes: string;

package/{i18nWriteTypes.js → generate/writeTypes.js}

@@ -1,22 +1,22 @@
 import { __awaiter, __generator } from "tslib";
 import { join } from "node:path";
 import { fsWrite } from "@koine/node";
-import { i18nGenerateTypes } from "./i18nGenerateTypes.js";
-import { i18nGetFsData } from "./i18nGetFsData.js";
-export function i18nWriteTypes(options) {
+import { generateTypes } from "./generateTypes.js";
+import { getFsData } from "./getFsData.js";
+export function writeTypes(options) {
     return __awaiter(this, void 0, void 0, function () {
         var cwd, defaultLocale, outputTypes, data, types;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     cwd = options.cwd, defaultLocale = options.defaultLocale, outputTypes = options.outputTypes;
-                    return [4, i18nGetFsData({
+                    return [4, getFsData({
                             cwd: cwd,
                             onlyFilesForLocales: [defaultLocale],
                         })];
                 case 1:
                     data = _a.sent();
-                    return [4, i18nGenerateTypes({ files: data.files, defaultLocale: defaultLocale })];
+                    return [4, generateTypes({ files: data.files, defaultLocale: defaultLocale })];
                 case 2:
                     types = _a.sent();
                     return [4, fsWrite(join(cwd, outputTypes), types)];

package/index.d.ts

@@ -1,8 +1,5 @@
 export { createTo } from "./createTo.js";
-export { i18nGenerateSummary } from "./i18nGenerateSummary.js";
-export { i18nGenerateTypes } from "./i18nGenerateTypes.js";
-export { i18nGetFsData } from "./i18nGetFsData.js";
-export { i18nGetLocalesFolders } from "./i18nGetLocalesFolders.js";
-export { i18nWriteTypes } from "./i18nWriteTypes.js";
-export { i18nWriteSummary } from "./i18nWriteSummary.js";
+export { isDynamicRouteId } from "./isDynamicRouteId.js";
+export { isStaticRouteId } from "./isStaticRouteId.js";
+export { routeHasDynamicPortion } from "./routeHasDynamicPortion.js";
 export * from "./types.js";

package/index.js

@@ -1,8 +1,5 @@
 export { createTo } from "./createTo.js";
-export { i18nGenerateSummary } from "./i18nGenerateSummary.js";
-export { i18nGenerateTypes } from "./i18nGenerateTypes.js";
-export { i18nGetFsData } from "./i18nGetFsData.js";
-export { i18nGetLocalesFolders } from "./i18nGetLocalesFolders.js";
-export { i18nWriteTypes } from "./i18nWriteTypes.js";
-export { i18nWriteSummary } from "./i18nWriteSummary.js";
+export { isDynamicRouteId } from "./isDynamicRouteId.js";
+export { isStaticRouteId } from "./isStaticRouteId.js";
+export { routeHasDynamicPortion } from "./routeHasDynamicPortion.js";
 export * from "./types.js";

package/isDynamicRouteId.d.ts

@@ -0,0 +1,3 @@
+import type { ToRoute, ToRouteDynamic } from "./types.js";
+export declare function isDynamicRouteId(routeId: ToRoute): routeId is ToRouteDynamic;
+export default isDynamicRouteId;

package/isDynamicRouteId.js

@@ -0,0 +1,5 @@
+import { routeHasDynamicPortion } from "./routeHasDynamicPortion.js";
+export function isDynamicRouteId(routeId) {
+    return routeHasDynamicPortion(routeId);
+}
+export default isDynamicRouteId;

package/isStaticRouteId.d.ts

@@ -0,0 +1,3 @@
+import type { ToRoute, ToRouteStatic } from "./types.js";
+export declare function isStaticRouteId(routeId: ToRoute): routeId is ToRouteStatic;
+export default isStaticRouteId;

package/isStaticRouteId.js

@@ -0,0 +1,5 @@
+import { routeHasDynamicPortion } from "./routeHasDynamicPortion.js";
+export function isStaticRouteId(routeId) {
+    return !routeHasDynamicPortion(routeId);
+}
+export default isStaticRouteId;

package/package.json

@@ -2,8 +2,8 @@
   "name": "@koine/i18n",
   "sideEffects": false,
   "dependencies": {
-    "@koine/node": "2.0.0-beta.30",
-    "@koine/utils": "2.0.0-beta.30"
+    "@koine/node": "2.0.0-beta.32",
+    "@koine/utils": "2.0.0-beta.32"
   },
   "peerDependenciesMeta": {
     "prettier": {
@@ -22,23 +22,38 @@
     "./createTo": {
       "import": "./createTo.js"
     },
-    "./i18nGenerateSummary": {
-      "import": "./i18nGenerateSummary.js"
+    "./generate/generateSummary": {
+      "import": "./generate/generateSummary.js"
     },
-    "./i18nGenerateTypes": {
-      "import": "./i18nGenerateTypes.js"
+    "./generate/generateTypes": {
+      "import": "./generate/generateTypes.js"
     },
-    "./i18nGetFsData": {
-      "import": "./i18nGetFsData.js"
+    "./generate/getFsData": {
+      "import": "./generate/getFsData.js"
     },
-    "./i18nGetLocalesFolders": {
-      "import": "./i18nGetLocalesFolders.js"
+    "./generate/getLocalesFolders": {
+      "import": "./generate/getLocalesFolders.js"
     },
-    "./i18nWriteSummary": {
-      "import": "./i18nWriteSummary.js"
+    "./generate": {
+      "import": "./generate/index.js"
     },
-    "./i18nWriteTypes": {
-      "import": "./i18nWriteTypes.js"
+    "./generate/types": {
+      "import": "./generate/types.js"
+    },
+    "./generate/writeSummary": {
+      "import": "./generate/writeSummary.js"
+    },
+    "./generate/writeTypes": {
+      "import": "./generate/writeTypes.js"
+    },
+    "./isDynamicRouteId": {
+      "import": "./isDynamicRouteId.js"
+    },
+    "./isStaticRouteId": {
+      "import": "./isStaticRouteId.js"
+    },
+    "./routeHasDynamicPortion": {
+      "import": "./routeHasDynamicPortion.js"
     },
     "./types": {
       "import": "./types.js"
@@ -48,5 +63,5 @@
     "prettier": "^3.1.1",
     "glob": "^10.3.10"
   },
-  "version": "2.0.0-beta.30"
+  "version": "2.0.0-beta.32"
 }

package/routeHasDynamicPortion.d.ts

@@ -0,0 +1,2 @@
+export declare function routeHasDynamicPortion(routeIdOrPortion: string): boolean;
+export default routeHasDynamicPortion;

package/routeHasDynamicPortion.js

@@ -0,0 +1,4 @@
+export function routeHasDynamicPortion(routeIdOrPortion) {
+    return /\[/.test(routeIdOrPortion);
+}
+export default routeHasDynamicPortion;

package/types.d.ts

@@ -1,18 +1,4 @@
 import type { Split } from "@koine/utils";
-export type I18nLocale = string & {
-    branded: true;
-};
-export type I18nIndexedFile = {
-    path: string;
-    locale: I18nLocale;
-    data: {
-        [key: string]: any;
-    };
-};
-export type I18nIndexedLocale = {
-    path: string;
-    code: I18nLocale;
-};
 type MergeDictionaries<T, K> = Omit<T, keyof K> & K;
 type Join<A, Sep extends string = "", R extends string = ""> = A extends [
     infer First,
@@ -60,9 +46,10 @@ export type TranslationOptions = undefined | TranslationShortcut | {
     default?: string;
 };
 export type Translate<TNamespace extends TranslateNamespace | undefined = TranslateNamespace> = TNamespace extends TranslateNamespace ? TranslateNamespaced<TNamespace> : TranslateDefault;
-export type TranslateDefault = <TPath extends TranslationsAllPaths>(s: TPath, q?: TranslationQuery, o?: TranslationOptions) => TranslationAtPath<TPath>;
-export type TranslateNamespaced<TNamespace extends TranslateNamespace> = <TPath extends TranslationsPaths<TranslationsDictionary[TNamespace]>>(s: TPath, q?: TranslationQuery, o?: TranslationOptions) => TranslationAtPathFromNamespace<TNamespace, TPath>;
-export type TranslateLoose = (s?: any, q?: TranslationQuery, o?: TranslationOptions) => string;
+export type TranslateDefault = <TPath extends TranslationsAllPaths, TReturn = TranslationAtPath<TPath>>(s: TPath, q?: TranslationQuery, o?: TranslationOptions) => TReturn;
+export type TranslateNamespaced<TNamespace extends TranslateNamespace> = <TPath extends TranslationsPaths<TranslationsDictionary[TNamespace]>, TReturn = TranslationAtPathFromNamespace<TNamespace, TPath>>(s: TPath, q?: TranslationQuery, o?: TranslationOptions) => TReturn;
+export type TranslateLoose<TReturn = string> = (s?: any, q?: TranslationQuery, o?: TranslationOptions) => TReturn;
+export type TranslateLoosest<TReturn = any> = (s?: any, q?: TranslationQuery, o?: TranslationOptions) => TReturn;
 export type TranslatedRoute = TranslationsPaths<TranslationsDictionary["~"], false>;
 export type TranslatedRoutesChildrenOf<TStarts extends string, T extends string = TranslatedRoute> = T extends `${TStarts}.${infer First}.${infer Second}` ? First | `${First}.${Second}` : T extends `${TStarts}.${infer First}` ? First : never;
 type OnlyStatic<T extends string> = T extends `${string}.[${string}].${string}` | `${string}.[${string}]` | `[${string}].${string}` | `[${string}]` ? never : T;

package/_helpers.d.ts

@@ -1,4 +0,0 @@
-import type { ToRoute, ToRouteDynamic, ToRouteStatic } from "./types.js";
-export declare function routeHasDynamicPortion(routeIdOrPortion: string): boolean;
-export declare function isStaticRouteId(routeId: ToRoute): routeId is ToRouteStatic;
-export declare function isDynamicRouteId(routeId: ToRoute): routeId is ToRouteDynamic;

package/_helpers.js

@@ -1,9 +0,0 @@
-export function routeHasDynamicPortion(routeIdOrPortion) {
-    return /\[/.test(routeIdOrPortion);
-}
-export function isStaticRouteId(routeId) {
-    return !routeHasDynamicPortion(routeId);
-}
-export function isDynamicRouteId(routeId) {
-    return routeHasDynamicPortion(routeId);
-}