Remove references to scripts directory

internals/common/src/models.ts

@@ -42,19 +42,37 @@ const getAllModelPackages = async (includeExperimental = false) => {
   return packageDirectoryNames.sort();
 }
 
-const getAllAvailableModels = async (packageName: string): Promise<AvailableModel[]> => {
+export const getUMDNames = async (packageName: string): Promise<Record<string, string | { index: string; direct: string; }>> => {
   const modelPackageDir = path.resolve(MODELS_DIR, packageName);
   const umdNamesPath = path.resolve(modelPackageDir, 'umd-names.json');
   if (!await exists(umdNamesPath)) {
     throw new Error(`No umd-names.json file found at ${umdNamesPath}`);
   }
-  const umdNames = JSON.parse(await readFile(umdNamesPath))
+  try {
+    const umdNames = JSON.parse(await readFile(umdNamesPath))
+    return umdNames;
+  } catch (e) {
+    throw new Error(`Error parsing umd-names.json file at ${umdNamesPath}: ${e}`);
+  }
+}
+
+const getAllAvailableModels = async (packageName: string): Promise<AvailableModel[]> => {
+  const modelPackageDir = path.resolve(MODELS_DIR, packageName);
+  const umdNames = await getUMDNames(modelPackageDir);
   const packageJSONExports = await getPackageJSONExports(modelPackageDir);
   return packageJSONExports.filter(k => k[0] !== '.').map(([key, value]) => {
     const umdName = umdNames[key];
     if (umdName === undefined) {
       throw new Error(`No UMD name defined for ${packageName}/umd-names.json for ${key}`);
     }
+    if (typeof umdName === 'object') {
+      return {
+        key,
+        umdName: umdName.direct,
+        umdNameFromIndex: umdName.index,
+        value,
+      };
+    }
     return {
       key,
       umdName,
@@ -87,7 +105,7 @@ const getAllModels = async (packageDirectoryNames: Promise<string[]>) => {
       modelPackagesAndModels.push({
         modelName: model.key,
         packageName,
-        modelUMDName: model.umdName, 
+        modelUMDName: model.umdName,
         packageDirectoryName,
         modelExport: model.value,
       });
@@ -110,6 +128,7 @@ export const ALL_MODELS: Promise<ModelInformation[]> = getAllModels(ALL_MODEL_PA
 interface AvailableModel {
   key: string;
   umdName: string;
+  umdNameFromIndex?: string;
   value: string | PackageJSONExport;
 }
 
@@ -134,7 +153,7 @@ const getPackagesAndModelsMatchingEnvironment = async (environment: Environment,
 };
 
 
-export const getPackagesAndModelsForEnvironment = async (environment: Environment) => {
+export const getPackagesAndModelsForEnvironment = async (environment: Environment): Promise<ModelInformation[]> => {
   const packagesAndModels = await ALL_MODELS;
   return getPackagesAndModelsMatchingEnvironment(environment, packagesAndModels);
 };

models/esrgan-legacy/DOC.mdx

@@ -143,9 +143,9 @@ import models from '@upscalerjs/esrgan-legacy';
 const upscaler = new Upscaler({
   model: models.GANS,
   // model: models.PSNRSmall,
-  // model: models.div2K2x,
-  // model: models.div2K3x,
-  // model: models.div2K4x,
+  // model: models.div2K2X,
+  // model: models.div2K3X,
+  // model: models.div2K4X,
 })
 ```
 

models/esrgan-legacy/src/umd.ts

@@ -1,6 +1,6 @@
-export { default as ESRGANLegacyDiv2kX2, } from './div2k/x2';
-export { default as ESRGANLegacyDiv2kX3, } from './div2k/x3';
-export { default as ESRGANLegacyDiv2kX4, } from './div2k/x4';
-export { default as ESRGANLegacyPSNRSmall, } from './psnr-small';
-export { default as ESRGANLegacyGANS, } from './gans';
+export { default as Div2kX2, } from './div2k/x2';
+export { default as Div2kX3, } from './div2k/x3';
+export { default as Div2kX4, } from './div2k/x4';
+export { default as PSNRSmall, } from './psnr-small';
+export { default as GANS, } from './gans';
 

models/esrgan-legacy/umd-names.json

@@ -1,8 +1,23 @@
 {
   ".": "ESRGANLegacy",
-  "./div2k/2x": "ESRGANLegacyDiv2kX2",
-  "./div2k/3x": "ESRGANLegacyDiv2kX3",
-  "./div2k/4x": "ESRGANLegacyDiv2kX4",
-  "./psnr-small": "ESRGANLegacyPSNRSmall",
-  "./gans": "ESRGANLegacyGANS"
+  "./div2k/2x": {
+    "index": "Div2kX2",
+    "direct": "ESRGANLegacyDiv2kX2"
+  },
+  "./div2k/3x": {
+    "index": "Div2kX3",
+    "direct": "ESRGANLegacyDiv2kX3"
+  },
+  "./div2k/4x": {
+    "index": "Div2kX4",
+    "direct": "ESRGANLegacyDiv2kX4"
+  },
+  "./psnr-small": {
+    "index": "PSNRSmall",
+    "direct": "ESRGANLegacyPSNRSmall"
+  },
+  "./gans": {
+    "index": "GANS",
+    "direct": "ESRGANLegacyGANS"
+  }
 }

models/esrgan-medium/src/umd.ts

@@ -1,4 +1,4 @@
-export { default as ESRGANMedium2x, } from './x2';
-export { default as ESRGANMedium3x, } from './x3';
-export { default as ESRGANMedium4x, } from './x4';
-export { default as ESRGANMedium8x, } from './x8';
+export { default as x2, } from './x2';
+export { default as x3, } from './x3';
+export { default as x4, } from './x4';
+export { default as x8, } from './x8';

models/esrgan-medium/umd-names.json

@@ -1,7 +1,7 @@
 {
   ".": "ESRGANMedium",
-  "./2x": "ESRGANMedium2x",
-  "./3x": "ESRGANMedium3x",
-  "./4x": "ESRGANMedium4x",
-  "./8x": "ESRGANMedium8x"
+  "./2x": { "index": "x2", "direct": "ESRGANMedium2x"},
+  "./3x": { "index": "x3", "direct": "ESRGANMedium3x"},
+  "./4x": { "index": "x4", "direct": "ESRGANMedium4x"},
+  "./8x": { "index": "x8", "direct": "ESRGANMedium8x"}
 }

models/esrgan-slim/src/umd.ts

@@ -1,4 +1,4 @@
-export { default as ESRGANSlim2x, } from './x2';
-export { default as ESRGANSlim3x, } from './x3';
-export { default as ESRGANSlim4x, } from './x4';
-export { default as ESRGANSlim8x, } from './x8';
+export { default as x2, } from './x2';
+export { default as x3, } from './x3';
+export { default as x4, } from './x4';
+export { default as x8, } from './x8';

models/esrgan-slim/umd-names.json

@@ -1,7 +1,7 @@
 {
   ".": "ESRGANSlim",
-  "./2x": "ESRGANSlim2x",
-  "./3x": "ESRGANSlim3x",
-  "./4x": "ESRGANSlim4x",
-  "./8x": "ESRGANSlim8x"
+  "./2x": { "index": "x2", "direct": "ESRGANSlim2x"},
+  "./3x": { "index": "x3", "direct": "ESRGANSlim3x"},
+  "./4x": { "index": "x4", "direct": "ESRGANSlim4x"},
+  "./8x": { "index": "x8", "direct": "ESRGANSlim8x"}
 }

models/esrgan-thick/src/umd.ts

@@ -1,4 +1,4 @@
-export { default as ESRGANThick2x, } from './x2';
-export { default as ESRGANThick3x, } from './x3';
-export { default as ESRGANThick4x, } from './x4';
-export { default as ESRGANThick8x, } from './x8';
+export { default as x2, } from './x2';
+export { default as x3, } from './x3';
+export { default as x4, } from './x4';
+export { default as x8, } from './x8';

models/esrgan-thick/umd-names.json

@@ -1,7 +1,19 @@
 {
   ".": "ESRGANThick",
-  "./2x": "ESRGANThick2x",
-  "./3x": "ESRGANThick3x",
-  "./4x": "ESRGANThick4x",
-  "./8x": "ESRGANThick8x"
+  "./2x": {
+    "index": "x2",
+    "direct": "ESRGANThick2x"
+  },
+  "./3x": {
+    "index": "x3",
+    "direct": "ESRGANThick3x"
+  },
+  "./4x": {
+    "index": "x4",
+    "direct": "ESRGANThick4x"
+  },
+  "./8x": {
+    "index": "x8",
+    "direct": "ESRGANThick8x"
+  }
 }

models/pixel-upsampler/src/umd.ts

@@ -1,3 +1,3 @@
-export { default as PixelUpsampler2x, } from './x2';
-export { default as PixelUpsampler3x, } from './x3';
-export { default as PixelUpsampler4x, } from './x4';
+export { default as x2, } from './x2';
+export { default as x3, } from './x3';
+export { default as x4, } from './x4';

models/pixel-upsampler/umd-names.json

@@ -1,6 +1,15 @@
 {
   ".": "PixelUpsampler",
-  "./x2": "PixelUpsampler2x",
-  "./x3": "PixelUpsampler3x",
-  "./x4": "PixelUpsampler4x"
+  "./x2": {
+    "index": "x2",
+    "direct": "PixelUpsampler2x"
+  },
+  "./x3": {
+    "index": "x3",
+    "direct": "PixelUpsampler3x"
+  },
+  "./x4": {
+    "index": "x4",
+    "direct": "PixelUpsampler4x"
+  }
 }

models/tsconfig.cjs.json

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "moduleResolution": "Node16",
-    "module": "CommonJS",
-    "target": "ES5",
-  },
+    "module": "Node16",
+    "target": "ES5"
+  }
 }