Refactor code to use ES6 module syntax and update dependencies; bump …

…version to 2.1.0

bin/textures

@@ -2,9 +2,12 @@
 
 // https://github.com/cpietsch/vikus-viewer-script
 // by Christopher Pietsch 2020
-const textures = require("../src/textures.js");
+import textures from "../src/textures.js";
 
-const argv = require("yargs")
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+
+const argv = yargs(hideBin(process.argv))
   .usage('Usage: vikus-viewer-script "/path/to/large/images/*.jpg" [options]')
   .command('"/path/to/large/images/*.jpg"', "Glob to input images")
   .example(
@@ -43,5 +46,5 @@ const argv = require("yargs")
 const inputPath = argv._[0];
 
 (async function main() {
-  await textures.run(inputPath, argv);
+  await textures(inputPath, argv);
 })();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vikus-viewer-script",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "description": "Preprocessing scripts for vikus-viewer",
   "author": {
     "name": "Christopher Pietsch",
@@ -23,13 +23,13 @@
   "main": "src/index.js",
   "scripts": {},
   "engines": {
-    "node": ">=v16.15.1"
+    "node": ">=20.3.0"
   },
+  "type": "module",
   "dependencies": {
-    "@mapbox/shelf-pack": "^3.2.0",
-    "sharpsheet": "^0.0.8",
-    "glob": "^8.0.3",
-    "sharp": "^0.30.6",
-    "yargs": "^17.5.1"
+    "sharpsheet": "^0.1.2",
+    "glob": "^11.0.0",
+    "sharp": "^0.33.5",
+    "yargs": "^17.7.2"
   }
 }

src/cascade.js

@@ -1,9 +1,9 @@
-const sharp = require("sharp");
-const path = require("path");
-const glob = require("glob");
-const fs = require("fs");
+import sharp from "sharp";
+import path from "path";
+import { glob } from 'glob';
+import fs from "fs";
 
-exports.run = async function* cascade(input, resizeSteps, options) {
+export default async function* cascade(input, resizeSteps, options) {
   const skipExisting = options.skipExisting || true;
   let files = [];
 
@@ -13,14 +13,16 @@ exports.run = async function* cascade(input, resizeSteps, options) {
     files = input
   }
 
-  for (i in files) {
+  console.log("found ", files);
+
+  for (let i in files) {
     const file = files[i];
     const basename = path.parse(file).name;
     const log = [];
 
     try {
       let instance = await sharp(file);
-      for (step of resizeSteps) {
+      for (let step of resizeSteps) {
         instance = instance.resize(step.width, step.height, { fit: "inside" });
         const outFilePath = step.path + "/" + basename + "." + step.format
 

src/textures.js

@@ -1,9 +1,9 @@
-const fs = require("fs");
-const path = require("path");
-const cascade = require("./cascade.js");
-const sharpsheet = require("sharpsheet");
+import fs from "fs";
+import path from "path";
+import cascade from "./cascade.js";
+import sharpsheet from "sharpsheet/src/sharpsheet.js";
 
-exports.run = async function textures(inputPath, options) {
+export default async function textures(inputPath, options) {
   const skipTextures = options.skipTextures || false;
   const textureRes1 = options.largeSize || 4096;
   const textureRes2 = options.mediumSize || 1024;
@@ -51,7 +51,7 @@ exports.run = async function textures(inputPath, options) {
 
   console.log("\nlooking for images at ", inputPath);
 
-  const resizer = cascade.run(inputPath, resizeSteps, { skipExisting });
+  const resizer = cascade(inputPath, resizeSteps, { skipExisting });
 
   let spritesheetFiles = [];
   for await (const operation of resizer) {