hackmud-script-manager 0.19.0-50a29ed → 0.19.0-cd5548c

package/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const supportedExtensions: string[];
+export declare const validDBMethods: string[];

package/constants.js

@@ -0,0 +1,4 @@
+const supportedExtensions = [`.js`, `.ts`];
+const validDBMethods = [`i`, `r`, `f`, `u`, `u1`, `us`, `ObjectId`];
+
+export { supportedExtensions, validDBMethods };

package/generateTypeDeclaration.js

@@ -1 +1,94 @@
-import{readdir as e}from"fs/promises";import{basename as t,resolve as n}from"path";const generateTypeDeclaration=async(s,i)=>{const a=new Set;if(i)for(const n of await e(i,{withFileTypes:!0}))n.isFile()&&n.name.endsWith(".key")&&a.add(t(n.name,".key"));const r=[],o=[],f={},l={};await Promise.all((await e(s,{withFileTypes:!0})).map((async i=>{if(i.isFile())i.name.endsWith(".ts")?i.name.endsWith(".d.ts")||r.push(t(i.name,".ts")):i.name.endsWith(".js")&&o.push(t(i.name,".js"));else if(i.isDirectory()){const r=[],o=[];f[i.name]=r,l[i.name]=o,a.add(i.name);for(const a of await e(n(s,i.name),{withFileTypes:!0}))a.isFile()&&(a.name.endsWith(".ts")?i.name.endsWith(".d.ts")||r.push(t(a.name,".ts")):a.name.endsWith(".js")&&o.push(t(a.name,".js")))}}))),s=n(s);let c="";for(const e of r)c+=`type $${e}$ = typeof import("${s}/${e}").default\n`;c+="\n";for(const e in f){const t=f[e];for(const n of t)c+=`type $${e}$${n}$ = typeof import("${s}/${e}/${n}").default\n`}c+="\ntype ArrayRemoveFirst<A> = A extends [ infer FirstItem, ...infer Rest ] ? Rest : never\n\ntype Subscript<T extends (...args: any) => any> =\n\t(...args: ArrayRemoveFirst<Parameters<T>>) => ReturnType<T> | ScriptFailure\n\ntype WildFullsec = Record<string, () => ScriptFailure> & {\n";for(const e of r)c+=`\t${e}: Subscript<$${e}$>\n`;for(const e of o)c+=`\t${e}: (...args: any) => any\n`;c+="}\n\ninterface PlayerFullsec {";let m=!0;for(const e of a){const t=f[e],n=l[e];if(t&&t.length||n&&n.length){if(m=!0,c+=`\n\t${e}: WildFullsec & {\n`,t)for(const n of t)c+=`\t\t${n}: Subscript<$${e}$${n}$>\n`;if(n)for(const e of n)c+=`\t\t${e}: (...args: any) => any\n`;c+="\t}"}else m&&(c+="\n",m=!1),c+=`\t${e}: WildFullsec`;c+="\n"}return c+="}\n",c};export{generateTypeDeclaration as default,generateTypeDeclaration};
+import { readdir } from 'fs/promises';
+import { basename, resolve } from 'path';
+
+const generateTypeDeclaration = async (sourceDirectory, hackmudPath) => {
+  const users = new Set();
+  if (hackmudPath) {
+    for (const dirent of await readdir(hackmudPath, {
+      withFileTypes: true
+    })) {
+      if (dirent.isFile() && dirent.name.endsWith(`.key`)) users.add(basename(dirent.name, `.key`));
+    }
+  }
+  const wildScripts = [];
+  const wildAnyScripts = [];
+  const allScripts = {};
+  const allAnyScripts = {};
+  await Promise.all((await readdir(sourceDirectory, {
+    withFileTypes: true
+  })).map(async dirent => {
+    if (dirent.isFile()) {
+      if (dirent.name.endsWith(`.ts`)) {
+        if (!dirent.name.endsWith(`.d.ts`)) wildScripts.push(basename(dirent.name, `.ts`));
+      } else if (dirent.name.endsWith(`.js`)) wildAnyScripts.push(basename(dirent.name, `.js`));
+    } else if (dirent.isDirectory()) {
+      const scripts = [];
+      const anyScripts = [];
+      allScripts[dirent.name] = scripts;
+      allAnyScripts[dirent.name] = anyScripts;
+      users.add(dirent.name);
+      for (const file of await readdir(resolve(sourceDirectory, dirent.name), {
+        withFileTypes: true
+      })) {
+        if (file.isFile()) {
+          if (file.name.endsWith(`.ts`)) {
+            if (!dirent.name.endsWith(`.d.ts`)) scripts.push(basename(file.name, `.ts`));
+          } else if (file.name.endsWith(`.js`)) anyScripts.push(basename(file.name, `.js`));
+        }
+      }
+    }
+  }));
+  sourceDirectory = resolve(sourceDirectory);
+  let o = ``;
+  for (const script of wildScripts) o += `type $${script}$ = typeof import("${sourceDirectory}/${script}").default\n`;
+  o += `\n`;
+  for (const user in allScripts) {
+    const scripts = allScripts[user];
+    for (const script of scripts) o += `type $${user}$${script}$ = typeof import("${sourceDirectory}/${user}/${script}").default\n`;
+  }
+
+  // TODO detect security level and generate apropriate code
+
+  // TODO accurate function signatures
+  // I lose the generic-ness of my functions when I wrap them
+  // regexing isn't enough and it looks like I'm going to need to parse the files in TypeScript to extract the signature
+
+  o += `
+type ArrayRemoveFirst<A> = A extends [ infer FirstItem, ...infer Rest ] ? Rest : never
+
+type Subscript<T extends (...args: any) => any> =
+	(...args: ArrayRemoveFirst<Parameters<T>>) => ReturnType<T> | ScriptFailure
+
+type WildFullsec = Record<string, () => ScriptFailure> & {
+`;
+  for (const script of wildScripts) o += `\t${script}: Subscript<$${script}$>\n`;
+  for (const script of wildAnyScripts) o += `\t${script}: (...args: any) => any\n`;
+  o += `}\n\ninterface PlayerFullsec {`;
+  let lastWasMultiLine = true;
+  for (const user of users) {
+    const scripts = allScripts[user];
+    const anyScripts = allAnyScripts[user];
+    if (scripts && scripts.length || anyScripts && anyScripts.length) {
+      lastWasMultiLine = true;
+      o += `\n\t${user}: WildFullsec & {\n`;
+      if (scripts) {
+        for (const script of scripts) o += `\t\t${script}: Subscript<$${user}$${script}$>\n`;
+      }
+      if (anyScripts) {
+        for (const script of anyScripts) o += `\t\t${script}: (...args: any) => any\n`;
+      }
+      o += `\t}`;
+    } else {
+      if (lastWasMultiLine) {
+        o += `\n`;
+        lastWasMultiLine = false;
+      }
+      o += `\t${user}: WildFullsec`;
+    }
+    o += `\n`;
+  }
+  o += `}\n`;
+  return o;
+};
+
+export { generateTypeDeclaration as default, generateTypeDeclaration };

package/index.d.ts

@@ -1,11 +1,11 @@
-export { supportedExtensions } from "./constants.json";
+export { supportedExtensions } from "./constants";
 export { generateTypeDeclaration } from "./generateTypeDeclaration";
 export { processScript } from "./processScript";
 export { pull } from "./pull";
 export { push } from "./push";
 export { syncMacros } from "./syncMacros";
 export { watch } from "./watch";
-export declare type Info = {
+export type Info = {
     file: string;
     users: string[];
     minLength: number;

package/index.js

@@ -1 +1,47 @@
-export{s as supportedExtensions}from"./constants-9bb78688.js";export{generateTypeDeclaration}from"./generateTypeDeclaration.js";export{processScript}from"./processScript/index.js";export{pull}from"./pull.js";export{push}from"./push.js";export{syncMacros}from"./syncMacros.js";export{watch}from"./watch.js";import"fs/promises";import"path";import"@babel/generator";import"@babel/parser";import"@babel/plugin-proposal-class-properties";import"@babel/plugin-proposal-class-static-block";import"@babel/plugin-proposal-decorators";import"@babel/plugin-proposal-json-strings";import"@babel/plugin-proposal-logical-assignment-operators";import"@babel/plugin-proposal-nullish-coalescing-operator";import"@babel/plugin-proposal-numeric-separator";import"@babel/plugin-proposal-object-rest-spread";import"@babel/plugin-proposal-optional-catch-binding";import"@babel/plugin-proposal-optional-chaining";import"@babel/plugin-proposal-private-property-in-object";import"@babel/plugin-transform-exponentiation-operator";import"@babel/traverse";import"@babel/types";import"@rollup/plugin-babel";import"@rollup/plugin-commonjs";import"@rollup/plugin-json";import"@rollup/plugin-node-resolve";import"prettier";import"rollup";import"./processScript/minify.js";import"acorn";import"terser";import"./processScript/shared.js";import"./assert-22a7ef8a.js";import"./spliceString-0e6b5d6d.js";import"./countHackmudCharacters-a08a265f.js";import"./processScript/postprocess.js";import"./processScript/preprocess.js";import"import-meta-resolve";import"./processScript/transform.js";import"fs";import"./writeFilePersistent-ee9c9bfd.js";import"chokidar";
+export { supportedExtensions } from './constants.js';
+export { generateTypeDeclaration } from './generateTypeDeclaration.js';
+export { processScript } from './processScript/index.js';
+export { pull } from './pull.js';
+export { push } from './push.js';
+export { syncMacros } from './syncMacros.js';
+export { watch } from './watch.js';
+import 'fs/promises';
+import 'path';
+import '@babel/generator';
+import '@babel/parser';
+import '@babel/plugin-proposal-class-properties';
+import '@babel/plugin-proposal-class-static-block';
+import '@babel/plugin-proposal-decorators';
+import '@babel/plugin-proposal-json-strings';
+import '@babel/plugin-proposal-logical-assignment-operators';
+import '@babel/plugin-proposal-nullish-coalescing-operator';
+import '@babel/plugin-proposal-numeric-separator';
+import '@babel/plugin-proposal-object-rest-spread';
+import '@babel/plugin-proposal-optional-catch-binding';
+import '@babel/plugin-proposal-optional-chaining';
+import '@babel/plugin-proposal-private-property-in-object';
+import '@babel/plugin-transform-exponentiation-operator';
+import '@babel/traverse';
+import '@babel/types';
+import '@rollup/plugin-babel';
+import '@rollup/plugin-commonjs';
+import '@rollup/plugin-json';
+import '@rollup/plugin-node-resolve';
+import '@samual/lib/assert';
+import 'prettier';
+import 'rollup';
+import './processScript/minify.js';
+import '@samual/lib/countHackmudCharacters';
+import '@samual/lib/spliceString';
+import 'acorn';
+import 'terser';
+import './processScript/shared.js';
+import './processScript/postprocess.js';
+import './processScript/preprocess.js';
+import 'import-meta-resolve';
+import './processScript/transform.js';
+import '@samual/lib/clearObject';
+import '@samual/lib/copyFilePersistent';
+import '@samual/lib/DynamicMap';
+import '@samual/lib/writeFilePersistent';
+import 'chokidar';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hackmud-script-manager",
-  "version": "0.19.0-50a29ed",
+  "version": "0.19.0-cd5548c",
   "description": "Script manager for game hackmud, with minification, TypeScript support, and player script type definition generation.",
   "keywords": [
     "api",
@@ -19,7 +19,7 @@
   ],
   "homepage": "https://github.com/samualtnorman/hackmud-script-manager#readme",
   "bugs": "https://github.com/samualtnorman/hackmud-script-manager/issues",
-  "license": "GPL-3.0-or-later",
+  "license": "MIT",
   "author": "Samual Norman",
   "main": "index.js",
   "repository": {
@@ -27,98 +27,56 @@
     "url": "https://github.com/samualtnorman/hackmud-script-manager.git"
   },
   "dependencies": {
-    "@babel/core": "^7.18.9",
-    "@babel/generator": "^7.18.9",
-    "@babel/parser": "^7.18.9",
+    "@babel/generator": "^7.22.9",
+    "@babel/parser": "^7.22.7",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-class-static-block": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.18.9",
-    "@babel/plugin-proposal-do-expressions": "^7.18.6",
-    "@babel/plugin-proposal-function-bind": "^7.18.9",
-    "@babel/plugin-proposal-function-sent": "^7.18.6",
+    "@babel/plugin-proposal-class-static-block": "^7.21.0",
+    "@babel/plugin-proposal-decorators": "^7.22.7",
+    "@babel/plugin-proposal-do-expressions": "^7.22.5",
+    "@babel/plugin-proposal-function-bind": "^7.22.5",
+    "@babel/plugin-proposal-function-sent": "^7.22.5",
     "@babel/plugin-proposal-json-strings": "^7.18.6",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
+    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-    "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-    "@babel/plugin-proposal-partial-application": "^7.18.9",
-    "@babel/plugin-proposal-pipeline-operator": "^7.18.9",
-    "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-    "@babel/plugin-proposal-record-and-tuple": "^7.18.6",
-    "@babel/plugin-proposal-throw-expressions": "^7.18.6",
-    "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-    "@babel/plugin-transform-typescript": "^7.18.8",
-    "@babel/traverse": "^7.18.9",
-    "@babel/types": "^7.18.9",
+    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
+    "@babel/plugin-proposal-partial-application": "^7.22.5",
+    "@babel/plugin-proposal-pipeline-operator": "^7.22.5",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@babel/plugin-proposal-record-and-tuple": "^7.22.5",
+    "@babel/plugin-proposal-throw-expressions": "^7.22.5",
+    "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
+    "@babel/plugin-transform-typescript": "^7.22.9",
+    "@babel/traverse": "^7.22.8",
+    "@babel/types": "^7.22.5",
     "@bloomberg/record-tuple-polyfill": "^0.0.4",
-    "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^22.0.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "acorn": "^8.7.1",
-    "chalk": "^5.0.1",
+    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-commonjs": "^25.0.2",
+    "@rollup/plugin-json": "^6.0.0",
+    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@samual/lib": "^0.8.1",
+    "acorn": "^8.10.0",
+    "chalk": "^5.3.0",
     "chokidar": "^3.5.3",
-    "import-meta-resolve": "^2.0.3",
-    "prettier": "^2.7.1",
+    "import-meta-resolve": "^3.0.0",
+    "prettier": "^3.0.0",
     "proxy-polyfill": "^0.3.2",
-    "rollup": "^2.77.0",
-    "terser": "^5.14.2"
-  },
-  "devDependencies": {
-    "@babel/preset-env": "^7.18.9",
-    "@babel/preset-typescript": "^7.18.6",
-    "@samual/lib": "^0.3.4",
-    "@types/babel__core": "^7.1.19",
-    "@types/babel__generator": "^7.6.4",
-    "@types/babel__traverse": "^7.17.1",
-    "@types/node": "^14.18.22",
-    "@types/prettier": "^2.6.3",
-    "@types/semver": "^7.3.10",
-    "@typescript-eslint/eslint-plugin": "^5.30.7",
-    "@typescript-eslint/parser": "^5.30.7",
-    "eslint": "^8.20.0",
-    "eslint-plugin-array-func": "^3.1.7",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-regexp": "^1.7.0",
-    "eslint-plugin-unicorn": "^43.0.2",
-    "latest-version": "^7.0.0",
-    "rollup-plugin-preserve-shebang": "^1.0.1",
-    "rollup-plugin-terser": "^7.0.2",
-    "semver": "^7.3.7",
-    "typescript": "^4.7.4"
-  },
-  "optionalDependencies": {
-    "deasync": "^0.1.27"
+    "rollup": "^3.26.2",
+    "terser": "^5.19.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "types": "index.d.ts",
   "type": "module",
   "exports": {
-    ".": {
-      "import": "./index.js",
-      "require": "./index.cjs"
-    },
-    "./*": "./*",
-    "./generateTypeDeclaration": "./generateTypeDeclaration.js",
-    "./index": "./index.js",
-    "./pull": "./pull.js",
-    "./push": "./push.js",
-    "./syncMacros": "./syncMacros.js",
-    "./watch": "./watch.js",
-    "./bin/hsm": "./bin/hsm.js",
-    "./processScript/index": "./processScript/index.js",
-    "./processScript": "./processScript/index.js",
-    "./processScript/minify": "./processScript/minify.js",
-    "./processScript/postprocess": "./processScript/postprocess.js",
-    "./processScript/preprocess": "./processScript/preprocess.js",
-    "./processScript/shared": "./processScript/shared.js",
-    "./processScript/transform": "./processScript/transform.js"
+    "./*": "./*.js",
+    "./*.js": "./*.js"
   },
   "bin": {
-    "hsm": "./bin/hsm.js"
+    "hsm.d": "bin/hsm.d.ts",
+    "hsm": "bin/hsm.js"
   }
 }

package/processScript/index.d.ts

@@ -1,9 +1,9 @@
-import { LaxPartial } from "@samual/lib";
+import type { LaxPartial } from "@samual/lib";
 export { minify } from "./minify";
 export { postprocess } from "./postprocess";
 export { preprocess } from "./preprocess";
 export { transform } from "./transform";
-export declare type ProcessOptions = {
+export type ProcessOptions = {
     /** whether to minify the given code */
     minify: boolean;
     /** 11 a-z 0-9 characters */