@koine/i18n 2.0.0-beta.76 → 2.0.0-beta.78

package/package.json

@@ -2,8 +2,8 @@
   "name": "@koine/i18n",
   "sideEffects": false,
   "dependencies": {
-    "@koine/node": "2.0.0-beta.76",
-    "@koine/utils": "2.0.0-beta.76",
+    "@koine/node": "2.0.0-beta.78",
+    "@koine/utils": "2.0.0-beta.78",
     "glob": "^10.3.10",
     "webpack": "^5.90.1",
     "minimatch": "^9.0.3",
@@ -28,318 +28,35 @@
       "optional": true
     }
   },
-  "module": "./index.js",
-  "type": "module",
-  "main": "./cjs/index.js",
   "exports": {
+    "./package.json": "./package.json",
     ".": {
-      "require": "./cjs/index.js",
-      "import": "./index.js"
+      "module": "./index.esm.js",
+      "import": "./index.cjs.mjs",
+      "default": "./index.cjs.js"
     },
-    "./actions/helpers-git": {
-      "require": "./cjs/actions/helpers-git.js",
-      "import": "./actions/helpers-git.js"
-    },
-    "./actions/helpers-i18n": {
-      "require": "./cjs/actions/helpers-i18n.js",
-      "import": "./actions/helpers-i18n.js"
-    },
-    "./actions/i18n": {
-      "require": "./cjs/actions/i18n.js",
-      "import": "./actions/i18n.js"
-    },
-    "./adapter-js/code/config.cjs": {
-      "require": "./cjs/adapter-js/code/config.cjs.js",
-      "import": "./adapter-js/code/config.cjs.js"
-    },
-    "./adapter-js/code/config": {
-      "require": "./cjs/adapter-js/code/config.js",
-      "import": "./adapter-js/code/config.js"
-    },
-    "./adapter-js/code/defaultLocale": {
-      "require": "./cjs/adapter-js/code/defaultLocale.js",
-      "import": "./adapter-js/code/defaultLocale.js"
-    },
-    "./adapter-js/code/deriveLocalisedPathnames": {
-      "require": "./cjs/adapter-js/code/deriveLocalisedPathnames.js",
-      "import": "./adapter-js/code/deriveLocalisedPathnames.js"
-    },
-    "./adapter-js/code": {
-      "require": "./cjs/adapter-js/code/index.js",
-      "import": "./adapter-js/code/index.js"
-    },
-    "./adapter-js/code/isLocale": {
-      "require": "./cjs/adapter-js/code/isLocale.js",
-      "import": "./adapter-js/code/isLocale.js"
-    },
-    "./adapter-js/code/locales": {
-      "require": "./cjs/adapter-js/code/locales.js",
-      "import": "./adapter-js/code/locales.js"
-    },
-    "./adapter-js/code/pathnameToRouteId": {
-      "require": "./cjs/adapter-js/code/pathnameToRouteId.js",
-      "import": "./adapter-js/code/pathnameToRouteId.js"
-    },
-    "./adapter-js/code/routes": {
-      "require": "./cjs/adapter-js/code/routes.js",
-      "import": "./adapter-js/code/routes.js"
-    },
-    "./adapter-js/code/routesSlim": {
-      "require": "./cjs/adapter-js/code/routesSlim.js",
-      "import": "./adapter-js/code/routesSlim.js"
-    },
-    "./adapter-js/code/routesSpa": {
-      "require": "./cjs/adapter-js/code/routesSpa.js",
-      "import": "./adapter-js/code/routesSpa.js"
-    },
-    "./adapter-js/code/tFns": {
-      "require": "./cjs/adapter-js/code/tFns.js",
-      "import": "./adapter-js/code/tFns.js"
-    },
-    "./adapter-js/code/tInterpolateParams": {
-      "require": "./cjs/adapter-js/code/tInterpolateParams.js",
-      "import": "./adapter-js/code/tInterpolateParams.js"
-    },
-    "./adapter-js/code/tPluralise": {
-      "require": "./cjs/adapter-js/code/tPluralise.js",
-      "import": "./adapter-js/code/tPluralise.js"
-    },
-    "./adapter-js/code/to": {
-      "require": "./cjs/adapter-js/code/to.js",
-      "import": "./adapter-js/code/to.js"
-    },
-    "./adapter-js/code/toFns": {
-      "require": "./cjs/adapter-js/code/toFns.js",
-      "import": "./adapter-js/code/toFns.js"
-    },
-    "./adapter-js/code/toFormat": {
-      "require": "./cjs/adapter-js/code/toFormat.js",
-      "import": "./adapter-js/code/toFormat.js"
-    },
-    "./adapter-js/code/toSpa": {
-      "require": "./cjs/adapter-js/code/toSpa.js",
-      "import": "./adapter-js/code/toSpa.js"
-    },
-    "./adapter-js/code/types": {
-      "require": "./cjs/adapter-js/code/types.js",
-      "import": "./adapter-js/code/types.js"
-    },
-    "./adapter-next-translate/code/DynamicNamespaces": {
-      "require": "./cjs/adapter-next-translate/code/DynamicNamespaces.js",
-      "import": "./adapter-next-translate/code/DynamicNamespaces.js"
-    },
-    "./adapter-next-translate/code/T": {
-      "require": "./cjs/adapter-next-translate/code/T.js",
-      "import": "./adapter-next-translate/code/T.js"
-    },
-    "./adapter-next-translate/code/TransText": {
-      "require": "./cjs/adapter-next-translate/code/TransText.js",
-      "import": "./adapter-next-translate/code/TransText.js"
-    },
-    "./adapter-next-translate/code/getT": {
-      "require": "./cjs/adapter-next-translate/code/getT.js",
-      "import": "./adapter-next-translate/code/getT.js"
-    },
-    "./adapter-next-translate/code": {
-      "require": "./cjs/adapter-next-translate/code/index.js",
-      "import": "./adapter-next-translate/code/index.js"
-    },
-    "./adapter-next-translate/code/nextTranslateI18n": {
-      "require": "./cjs/adapter-next-translate/code/nextTranslateI18n.js",
-      "import": "./adapter-next-translate/code/nextTranslateI18n.js"
-    },
-    "./adapter-next-translate/code/useT": {
-      "require": "./cjs/adapter-next-translate/code/useT.js",
-      "import": "./adapter-next-translate/code/useT.js"
-    },
-    "./adapter-next/code": {
-      "require": "./cjs/adapter-next/code/index.js",
-      "import": "./adapter-next/code/index.js"
-    },
-    "./adapter-next/code/next-redirects": {
-      "require": "./cjs/adapter-next/code/next-redirects.js",
-      "import": "./adapter-next/code/next-redirects.js"
-    },
-    "./adapter-next/code/next-rewrites": {
-      "require": "./cjs/adapter-next/code/next-rewrites.js",
-      "import": "./adapter-next/code/next-rewrites.js"
-    },
-    "./adapter-next/code/useCurrentLocalisedPathnames": {
-      "require": "./cjs/adapter-next/code/useCurrentLocalisedPathnames.js",
-      "import": "./adapter-next/code/useCurrentLocalisedPathnames.js"
-    },
-    "./adapter-next/code/useLocale": {
-      "require": "./cjs/adapter-next/code/useLocale.js",
-      "import": "./adapter-next/code/useLocale.js"
-    },
-    "./adapter-next/code/useRouteId": {
-      "require": "./cjs/adapter-next/code/useRouteId.js",
-      "import": "./adapter-next/code/useRouteId.js"
-    },
-    "./adapter-next/code/useTo": {
-      "require": "./cjs/adapter-next/code/useTo.js",
-      "import": "./adapter-next/code/useTo.js"
-    },
-    "./adapter-next/code/useToSpa": {
-      "require": "./cjs/adapter-next/code/useToSpa.js",
-      "import": "./adapter-next/code/useToSpa.js"
-    },
-    "./adapter-next/plugin-async": {
-      "require": "./cjs/adapter-next/plugin-async.js",
-      "import": "./adapter-next/plugin-async.js"
-    },
-    "./adapter-next/plugin-legacy": {
-      "require": "./cjs/adapter-next/plugin-legacy.js",
-      "import": "./adapter-next/plugin-legacy.js"
-    },
-    "./adapter-next/plugin-shared": {
-      "require": "./cjs/adapter-next/plugin-shared.js",
-      "import": "./adapter-next/plugin-shared.js"
-    },
-    "./adapter-next/plugin": {
-      "require": "./cjs/adapter-next/plugin.js",
-      "import": "./adapter-next/plugin.js"
-    },
-    "./adapter-next/redirects": {
-      "require": "./cjs/adapter-next/redirects.js",
-      "import": "./adapter-next/redirects.js"
-    },
-    "./adapter-next/rewrites": {
-      "require": "./cjs/adapter-next/rewrites.js",
-      "import": "./adapter-next/rewrites.js"
-    },
-    "./adapter-next/transformPathname": {
-      "require": "./cjs/adapter-next/transformPathname.js",
-      "import": "./adapter-next/transformPathname.js"
-    },
-    "./adapter-next/webpackPluginI18n": {
-      "require": "./cjs/adapter-next/webpackPluginI18n.js",
-      "import": "./adapter-next/webpackPluginI18n.js"
-    },
-    "./client/formatRoutePathname": {
-      "require": "./cjs/client/formatRoutePathname.js",
-      "import": "./client/formatRoutePathname.js"
-    },
-    "./client": {
-      "require": "./cjs/client/index.js",
-      "import": "./client/index.js"
-    },
-    "./client/interpolateTo": {
-      "require": "./cjs/client/interpolateTo.js",
-      "import": "./client/interpolateTo.js"
-    },
-    "./client/routeHasDynamicPortion": {
-      "require": "./cjs/client/routeHasDynamicPortion.js",
-      "import": "./client/routeHasDynamicPortion.js"
+    "./compiler": {
+      "module": "./compiler.esm.js",
+      "import": "./compiler.cjs.mjs",
+      "default": "./compiler.cjs.js"
     },
     "./compiler-sync": {
-      "require": "./cjs/compiler-sync.js",
-      "import": "./compiler-sync.js"
+      "module": "./compiler-sync.esm.js",
+      "import": "./compiler-sync.cjs.mjs",
+      "default": "./compiler-sync.cjs.js"
     },
     "./compiler-worker": {
-      "require": "./cjs/compiler-worker.js",
-      "import": "./compiler-worker.js"
-    },
-    "./compiler": {
-      "require": "./cjs/compiler.js",
-      "import": "./compiler.js"
-    },
-    "./compiler/api": {
-      "require": "./cjs/compiler/api.js",
-      "import": "./compiler/api.js"
-    },
-    "./compiler/code/data-routes": {
-      "require": "./cjs/compiler/code/data-routes.js",
-      "import": "./compiler/code/data-routes.js"
-    },
-    "./compiler/code/data-translations": {
-      "require": "./cjs/compiler/code/data-translations.js",
-      "import": "./compiler/code/data-translations.js"
-    },
-    "./compiler/code/data": {
-      "require": "./cjs/compiler/code/data.js",
-      "import": "./compiler/code/data.js"
-    },
-    "./compiler/code/generate": {
-      "require": "./cjs/compiler/code/generate.js",
-      "import": "./compiler/code/generate.js"
-    },
-    "./compiler/code": {
-      "require": "./cjs/compiler/code/index.js",
-      "import": "./compiler/code/index.js"
-    },
-    "./compiler/code/tsCompile": {
-      "require": "./cjs/compiler/code/tsCompile.js",
-      "import": "./compiler/code/tsCompile.js"
-    },
-    "./compiler/code/write": {
-      "require": "./cjs/compiler/code/write.js",
-      "import": "./compiler/code/write.js"
-    },
-    "./compiler/config": {
-      "require": "./cjs/compiler/config.js",
-      "import": "./compiler/config.js"
-    },
-    "./compiler/helpers": {
-      "require": "./cjs/compiler/helpers.js",
-      "import": "./compiler/helpers.js"
-    },
-    "./compiler/input/data-local": {
-      "require": "./cjs/compiler/input/data-local.js",
-      "import": "./compiler/input/data-local.js"
-    },
-    "./compiler/input/data-remote": {
-      "require": "./cjs/compiler/input/data-remote.js",
-      "import": "./compiler/input/data-remote.js"
-    },
-    "./compiler/input/data": {
-      "require": "./cjs/compiler/input/data.js",
-      "import": "./compiler/input/data.js"
-    },
-    "./compiler/input": {
-      "require": "./cjs/compiler/input/index.js",
-      "import": "./compiler/input/index.js"
-    },
-    "./compiler/input/types": {
-      "require": "./cjs/compiler/input/types.js",
-      "import": "./compiler/input/types.js"
-    },
-    "./compiler/input/write": {
-      "require": "./cjs/compiler/input/write.js",
-      "import": "./compiler/input/write.js"
-    },
-    "./compiler/pluralisation": {
-      "require": "./cjs/compiler/pluralisation.js",
-      "import": "./compiler/pluralisation.js"
-    },
-    "./compiler/summary/data": {
-      "require": "./cjs/compiler/summary/data.js",
-      "import": "./compiler/summary/data.js"
-    },
-    "./compiler/summary/generate": {
-      "require": "./cjs/compiler/summary/generate.js",
-      "import": "./compiler/summary/generate.js"
-    },
-    "./compiler/summary": {
-      "require": "./cjs/compiler/summary/index.js",
-      "import": "./compiler/summary/index.js"
-    },
-    "./compiler/summary/write": {
-      "require": "./cjs/compiler/summary/write.js",
-      "import": "./compiler/summary/write.js"
-    },
-    "./compiler/types": {
-      "require": "./cjs/compiler/types.js",
-      "import": "./compiler/types.js"
+      "module": "./compiler-worker.esm.js",
+      "import": "./compiler-worker.cjs.mjs",
+      "default": "./compiler-worker.cjs.js"
     },
     "./next": {
-      "require": "./cjs/next.js",
-      "import": "./next.js"
-    },
-    "./types": {
-      "require": "./cjs/types.js",
-      "import": "./types.js"
+      "module": "./next.esm.js",
+      "import": "./next.cjs.mjs",
+      "default": "./next.cjs.js"
     }
   },
-  "version": "2.0.0-beta.76"
+  "module": "./index.esm.js",
+  "main": "./index.cjs.js",
+  "version": "2.0.0-beta.78"
 }

package/actions/helpers-git.js

@@ -1,45 +0,0 @@
-import * as t from "@actions/core";
-import { simpleGit as i } from "simple-git";
-function e(i, e) {
-    e && console.log(e), i && t.error(i);
-}
-export class Git {
-    constructor(i, e){
-        this.errors = [], this.baseDir = i, this.afterFetch = e, this.outputs = {
-            committed: "false",
-            commit_sha: void 0,
-            pushed: "false"
-        }, Object.entries(this.outputs).forEach(([i, e])=>t.setOutput(i, e));
-    }
-    async run() {
-        let s = i({
-            baseDir: this.baseDir
-        }), o = process.env.GITHUB_REF?.substring(11) || "main";
-        t.info(`Running in folder ${this.baseDir}...`), t.info("> Pulling from remote..."), await s.fetch(void 0, e).pull(void 0, void 0, void 0, e), await this.afterFetch(), t.info("> Checking for uncommitted changes in the git working tree...");
-        let r = (await s.status()).files.length;
-        r ? (t.info(`> Found ${r} changed files.`), await s.fetch([
-            "--tags",
-            "--force"
-        ], e), t.info("> Re-staging files..."), await s.add(".").catch((t)=>{
-            if (t.message.includes("fatal: pathspec") && t.message.includes("did not match any files")) this.errors.push(Error("Add command did not match any file"));
-            else throw t;
-        }), t.info("> Creating commit..."), await s.commit("chore(action): auto commit", void 0, {}, (t, i)=>(i && (this.setOutput("committed", "true"), this.setOutput("commit_sha", i.commit)), e(t, i))), t.info("> Pushing commit to repo..."), await s.push("origin", o, {
-            "--set-upstream": null
-        }, (t, i)=>(i && this.setOutput("pushed", "true"), e(t, i))), t.endGroup(), t.info("> Task completed!!!")) : (t.endGroup(), t.info("> Working tree clean. Nothing to commit."));
-    }
-    setOutput(i, e) {
-        this.outputs[i] = e, t.setOutput(i, e);
-    }
-    logOutputs() {
-        for(let i in t.startGroup("Outputs"), this.outputs)t.info(`${i}: ${this.outputs[i]}`);
-        t.endGroup();
-    }
-    success() {
-        if (1 === this.errors.length) throw this.errors[0];
-        if (this.errors.length > 1) throw this.errors.forEach((i)=>t.error(i)), "There have been multiple runtime errors.";
-        this.logOutputs();
-    }
-    error(i) {
-        t.endGroup(), this.logOutputs(), t.setFailed(i);
-    }
-}

package/actions/helpers-i18n.js

@@ -1,27 +0,0 @@
-import { getConfig as o } from "../compiler/config";
-import { getInputDataLocal as r } from "../compiler/input/data-local";
-import { writeInput as t } from "../compiler/input/write";
-import { getSummaryData as i } from "../compiler/summary/data";
-import { writeSummary as m } from "../compiler/summary/write";
-export let i18nAction = async (p)=>{
-    let { cwd: u, source: e = ".", url: a, output: { input: l, summaryJson: c, summaryMarkdown: n }, ...s } = p, f = await r({
-        cwd: u,
-        source: e,
-        ...s
-    }), w = [];
-    if (l && w.push(t({
-        cwd: u,
-        output: l
-    }, f)), c || n) {
-        let r = i(o(f), {
-            sourceUrl: a
-        }, f);
-        w.push(m({
-            cwd: u,
-            outputJson: c,
-            outputMarkdown: n,
-            sourceUrl: a
-        }, r));
-    }
-    return await Promise.all(w), f;
-};

package/actions/i18n.js

@@ -1,17 +0,0 @@
-import { getInput as o, info as s } from "@actions/core";
-import { Git as r } from "./helpers-git";
-import { i18nAction as t } from "./helpers-i18n";
-let e = async ()=>{
-    let r = process.env.GITHUB_REPOSITORY, e = process.env.GITHUB_REF.replace("refs/heads/", ""), u = `https://github.com/${r}/blob/${e}`, n = await t({
-        url: u,
-        output: {
-            input: o("output_input") || ".github/input.json",
-            summaryJson: o("output_summary_json") || ".github/summary.json",
-            summaryMarkdown: o("output_summary_md") || ".github/summary.md"
-        }
-    });
-    s(`Found locales: ${n.localesFolders.join(", ")}`), s(`Found ${n.translationFiles.length} JSON files`);
-}, u = new r(process.cwd(), e);
-u.run().then(()=>u.success()).catch((o)=>{
-    u.error(o), console.error(o);
-});

package/adapter-js/code/config.cjs.js

@@ -1,14 +0,0 @@
-export default (({ config: e })=>`
-const { locales } = require("./locales");
-const { defaultLocale } = require("./defaultLocale");
-
-const config = {
-  locales,
-  defaultLocale,
-  hideDefaultLocaleInUrl: ${e.hideDefaultLocaleInUrl},
-};
-
-exports.config = config;
-
-module.exports = config;
-`);

package/adapter-js/code/config.js

@@ -1,14 +0,0 @@
-export default (({ config: e })=>`
-import { locales } from "./locales";
-import { defaultLocale } from "./defaultLocale";
-
-/**
- */
-export const config = {
-  locales,
-  defaultLocale,
-  hideDefaultLocaleInUrl: ${e.hideDefaultLocaleInUrl},
-}
-
-export default config;
-`);

package/adapter-js/code/defaultLocale.js

@@ -1,7 +0,0 @@
-export default (({ config: e })=>`
-import type { I18n } from "./types";
-
-export const defaultLocale: I18n.Locale = "${e.defaultLocale}";
-
-export default defaultLocale;
-`);

package/adapter-js/code/deriveLocalisedPathnames.js

@@ -1,78 +0,0 @@
-export default (()=>`
-import { locales } from "./locales";
-import { to } from "./to";
-import type { I18n } from "./types";
-
-function getPathnameDynamicPortionName(pathname: string) {
-  const res = pathname.match(/\\[(.+)\\]/);
-  return res ? res[1] : false;
-}
-
-function isStaticPathname(pathname: string) {
-  return !/\\[/.test(pathname);
-}
-
-// e.g. ['my', 'path', 'id', 'view'] or ['nl' 'my', 'path', 'id', 'view']
-// where the first might be the locale (depending on hideDefaultLocaleInUrl)
-function getPathnameParts(pathname: string) {
-  return pathname
-    .split("/")
-    .slice(1)
-    .filter((p, i) => (i === 0 ? !locales.includes(p as I18n.Locale) : true));
-}
-
-function localisePathname(
-  locale: I18n.Locale,
-  // e.g. "my.path.[id].view"
-  routeId: I18n.RouteIdDynamic | I18n.RouteIdStatic,
-  locationLike: LocationLike
-) {
-  const toPathname = to(routeId as I18n.RouteIdStatic, locale);
-
-  if (isStaticPathname(toPathname)) {
-    return toPathname;
-  }
-  // e.g. ['my', 'path', '[id]', 'view']
-  const toPathnameParts = getPathnameParts(toPathname);
-  // e.g. "my.path.[id].view"
-  const routeIdDynamic = routeId as I18n.RouteIdDynamic;
-  // e.g. /my/path/123/view
-  const currentPathname = locationLike.pathname;
-  // e.g. ['my', 'path', '123', 'view']
-  const currentPathnameParts = getPathnameParts(currentPathname);
-  // e.g. { id: "123" }
-  const params: Record<string, string> = {};
-
-  for (let i = 0; i < toPathnameParts.length; i++) {
-    // e.g. "my" or "[id]"
-    const part = toPathnameParts[i];
-    // e.g. "id"
-    const name = getPathnameDynamicPortionName(part);
-    if (name) {
-      // e.g. "123"
-      const value = currentPathnameParts[i];
-      if (value) {
-        params[name] = value;
-      }
-    }
-  }
-
-  return (
-    to(routeIdDynamic, params as never, locale) +
-    location?.search || "" +
-    location?.hash || ""
-  );
-}
-
-type LocationLike = { pathname: string; search?: string; hash?: string; };
-
-export type LocalisedPathnames = Record<I18n.Locale, string>;
-
-export const deriveLocalisedPathnames = (routeId: I18n.RouteId, locationLike: LocationLike) =>
-  locales.reduce((pathnames, locale) => {
-    pathnames[locale] = localisePathname(locale, routeId, locationLike);
-    return pathnames;
-  }, {} as LocalisedPathnames);
-
-export default deriveLocalisedPathnames;
-`);