hackmud-script-manager 0.19.1-64ab3ba → 0.19.1-6d8d544
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/hsm.d.ts +0 -0
- package/bin/hsm.js +127 -283
- package/env.d.ts +1357 -0
- package/generateTypeDeclaration.d.ts +1 -2
- package/generateTypeDeclaration.js +2 -2
- package/index.d.ts +2 -2
- package/package.json +6 -7
- package/processScript/index.d.ts +17 -26
- package/processScript/index.js +257 -257
- package/processScript/minify.d.ts +15 -21
- package/processScript/minify.js +381 -395
- package/processScript/postprocess.d.ts +0 -1
- package/processScript/postprocess.js +1 -1
- package/processScript/preprocess.d.ts +6 -9
- package/processScript/preprocess.js +94 -94
- package/processScript/shared.d.ts +1 -1
- package/processScript/shared.js +11 -11
- package/processScript/transform.d.ts +13 -18
- package/processScript/transform.js +594 -559
- package/pull.d.ts +5 -9
- package/pull.js +2 -2
- package/push.d.ts +24 -33
- package/push.js +86 -217
- package/syncMacros.d.ts +1 -2
- package/syncMacros.js +3 -3
- package/typescript@5.3.3.patch +882 -0
- package/watch.d.ts +10 -16
- package/watch.js +20 -20
- package/tsconfig.tsbuildinfo +0 -1
package/pull.d.ts
CHANGED
@@ -1,9 +1,5 @@
|
|
1
|
-
/**
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
* @param script to pull in `user.name` format
|
7
|
-
*/
|
8
|
-
export declare const pull: (sourceFolderPath: string, hackmudPath: string, script: string) => Promise<void>;
|
9
|
-
export default pull;
|
1
|
+
/** Copies script from hackmud to local source folder.
|
2
|
+
* @param sourceFolderPath path to folder containing source files
|
3
|
+
* @param hackmudPath path to hackmud directory
|
4
|
+
* @param script to pull in `user.name` format */
|
5
|
+
export declare function pull(sourceFolderPath: string, hackmudPath: string, script: string): Promise<void>;
|
package/pull.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
import { copyFilePersistent } from "@samual/lib/copyFilePersistent"
|
2
2
|
import { resolve } from "path"
|
3
|
-
|
3
|
+
async function pull(sourceFolderPath, hackmudPath, script) {
|
4
4
|
const [user, name] = script.split(".")
|
5
5
|
if (!user || !name) throw Error('`script` argument must be in "user.name" format')
|
6
6
|
await copyFilePersistent(
|
@@ -8,4 +8,4 @@ const pull = async (sourceFolderPath, hackmudPath, script) => {
|
|
8
8
|
resolve(sourceFolderPath, user, name + ".js")
|
9
9
|
)
|
10
10
|
}
|
11
|
-
export { pull
|
11
|
+
export { pull }
|
package/push.d.ts
CHANGED
@@ -1,37 +1,28 @@
|
|
1
1
|
import type { LaxPartial } from "@samual/lib";
|
2
2
|
import type { Info } from ".";
|
3
|
-
export type PushOptions = {
|
4
|
-
/** whether to do the minify step (defaults to `true`) */
|
5
|
-
|
6
|
-
/**
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
* also accepts wild card (`*`) e.g. `*.bar` or `foo.*`
|
12
|
-
*
|
13
|
-
* pushes everything by default (`*.*`)
|
14
|
-
*/
|
3
|
+
export type PushOptions = LaxPartial<{
|
4
|
+
/** whether to do the minify step (defaults to `true`) */ minify: boolean;
|
5
|
+
/** whether to mangle function and class names (defaults to `false`) */ mangleNames: boolean;
|
6
|
+
/** array of scripts in the format `foo.bar`
|
7
|
+
*
|
8
|
+
* also accepts wild card (`*`) e.g. `*.bar` or `foo.*`
|
9
|
+
*
|
10
|
+
* pushes everything by default (`*.*`) */
|
15
11
|
scripts: string[];
|
16
|
-
/** callback called on script push */
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
* when left unset or set to `undefined`, automatically uses or doesn't use quine cheats based on character count
|
24
|
-
*/
|
12
|
+
/** callback called on script push */ onPush: (info: Info) => void;
|
13
|
+
/** when set to `true` forces use of quine cheats
|
14
|
+
*
|
15
|
+
* when set to `false` forces quine cheats not to be used
|
16
|
+
*
|
17
|
+
* when left unset or set to `undefined`, automatically uses or doesn't use quine cheats based on character count
|
18
|
+
*/
|
25
19
|
forceQuineCheats: boolean;
|
26
|
-
}
|
27
|
-
/**
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
*/
|
36
|
-
export declare const push: (sourceDirectory: string, hackmudDirectory: string, { scripts, onPush, minify, mangleNames, forceQuineCheats }?: LaxPartial<PushOptions>) => Promise<Info[]>;
|
37
|
-
export default push;
|
20
|
+
}>;
|
21
|
+
/** Push scripts from a source directory to the hackmud directory.
|
22
|
+
*
|
23
|
+
* Pushes files directly in the source folder to all users
|
24
|
+
* @param sourcePath directory containing source code
|
25
|
+
* @param hackmudPath directory created by hackmud containing user data including scripts
|
26
|
+
* @param options {@link PushOptions details}
|
27
|
+
* @returns array of info on pushed scripts */
|
28
|
+
export declare function push(sourcePath: string, hackmudPath: string, { scripts, onPush, minify, mangleNames, forceQuineCheats }?: PushOptions): Promise<Info[]>;
|
package/push.js
CHANGED
@@ -1,10 +1,10 @@
|
|
1
1
|
import { Cache } from "@samual/lib/Cache"
|
2
|
+
import { ensure, assert } from "@samual/lib/assert"
|
2
3
|
import { countHackmudCharacters } from "@samual/lib/countHackmudCharacters"
|
3
4
|
import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
|
4
5
|
import { writeFilePersistent } from "@samual/lib/writeFilePersistent"
|
5
6
|
import { readFile } from "fs/promises"
|
6
|
-
import { basename, resolve
|
7
|
-
import { supportedExtensions } from "./constants.js"
|
7
|
+
import { basename, resolve } from "path"
|
8
8
|
import { processScript } from "./processScript/index.js"
|
9
9
|
import "@babel/generator"
|
10
10
|
import "@babel/parser"
|
@@ -29,9 +29,9 @@ import "@rollup/plugin-babel"
|
|
29
29
|
import "@rollup/plugin-commonjs"
|
30
30
|
import "@rollup/plugin-json"
|
31
31
|
import "@rollup/plugin-node-resolve"
|
32
|
-
import "@samual/lib/assert"
|
33
32
|
import "prettier"
|
34
33
|
import "rollup"
|
34
|
+
import "./constants.js"
|
35
35
|
import "./processScript/minify.js"
|
36
36
|
import "@samual/lib/spliceString"
|
37
37
|
import "acorn"
|
@@ -42,228 +42,97 @@ import "./processScript/preprocess.js"
|
|
42
42
|
import "import-meta-resolve"
|
43
43
|
import "./processScript/transform.js"
|
44
44
|
import "@samual/lib/clearObject"
|
45
|
-
|
46
|
-
|
47
|
-
|
45
|
+
async function push(
|
46
|
+
sourcePath,
|
47
|
+
hackmudPath,
|
48
48
|
{ scripts = ["*.*"], onPush = () => {}, minify = !0, mangleNames = !1, forceQuineCheats } = {}
|
49
|
-
)
|
50
|
-
const
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
49
|
+
) {
|
50
|
+
const [sourceFolder, hackmudFolder] = await Promise.all([
|
51
|
+
readDirectoryWithStats(sourcePath),
|
52
|
+
readDirectoryWithStats(hackmudPath)
|
53
|
+
]),
|
54
|
+
sourceFolderFolders = sourceFolder.filter(({ stats }) => stats.isDirectory()),
|
55
|
+
allUsers = new Set([
|
56
|
+
...scripts
|
57
|
+
.map(scriptName => ensure(scriptName.split(".")[0], "src/push.ts:52:65"))
|
58
|
+
.filter(name => "*" != name),
|
59
|
+
...sourceFolderFolders.map(({ name }) => name),
|
60
|
+
...hackmudFolder.filter(({ stats }) => stats.isDirectory()).map(({ name }) => name),
|
61
|
+
...hackmudFolder
|
62
|
+
.filter(({ stats, name }) => stats.isFile() && name.endsWith(".key"))
|
63
|
+
.map(({ name }) => name.slice(0, -4))
|
64
|
+
]),
|
65
|
+
usersToScriptsToPush = new Cache(_user => new Map()),
|
66
|
+
scriptNamesToUsers = new Cache(_scriptName => new Set())
|
67
|
+
for (const script of scripts) {
|
68
|
+
const [user, scriptName] = script.split(".")
|
69
|
+
assert(user, "src/push.ts:69:16")
|
70
|
+
assert(scriptName, "src/push.ts:70:22")
|
71
|
+
"*" == user ? scriptNamesToUsers.set(scriptName, allUsers) : scriptNamesToUsers.get(scriptName).add(user)
|
62
72
|
}
|
63
|
-
const
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
const allUsers = new Set([
|
74
|
-
...sourceDirectoryDirents.filter(({ stats }) => stats.isDirectory()).map(({ path }) => basename(path)),
|
75
|
-
...hackmudDirectoryEntries.filter(({ stats }) => stats.isDirectory()).map(({ name }) => name),
|
76
|
-
...hackmudDirectoryEntries
|
77
|
-
.filter(({ name, stats }) => stats.isFile() && name.endsWith(".key"))
|
78
|
-
.map(({ name }) => name.slice(0, -4)),
|
79
|
-
...scriptNamesByUser.keys(),
|
80
|
-
...wildScriptUsers
|
81
|
-
])
|
82
|
-
if (pushEverything) for (const user of allUsers) wildScriptUsers.add(user)
|
83
|
-
else
|
84
|
-
for (const user of allUsers) {
|
85
|
-
const scriptNames = scriptNamesByUser.get(user)
|
86
|
-
for (const scriptName of wildUserScripts) scriptNames.add(scriptName)
|
87
|
-
}
|
73
|
+
const sourceFolderFiles = sourceFolder.filter(({ stats }) => stats.isFile()),
|
74
|
+
wildScriptUsers_ = scriptNamesToUsers.get("*")
|
75
|
+
scriptNamesToUsers.delete("*")
|
76
|
+
for (const { name, path } of [
|
77
|
+
...sourceFolderFiles.filter(({ name }) => name.endsWith(".js")),
|
78
|
+
...sourceFolderFiles.filter(({ name }) => name.endsWith(".ts"))
|
79
|
+
]) {
|
80
|
+
const scriptName = name.slice(0, -3)
|
81
|
+
for (const user of [...wildScriptUsers_, ...scriptNamesToUsers.get(scriptName)])
|
82
|
+
usersToScriptsToPush.get(user).set(scriptName, path)
|
88
83
|
}
|
89
84
|
await Promise.all(
|
90
|
-
|
91
|
-
await readDirectoryWithStats(
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
{
|
102
|
-
minify,
|
103
|
-
scriptUser: user,
|
104
|
-
scriptName,
|
105
|
-
filePath: path,
|
106
|
-
mangleNames,
|
107
|
-
forceQuineCheats
|
108
|
-
}
|
109
|
-
),
|
110
|
-
info = {
|
111
|
-
file: `${user}/${name}`,
|
112
|
-
users: [user],
|
113
|
-
minLength: countHackmudCharacters(minifiedCode),
|
114
|
-
error: void 0
|
115
|
-
}
|
116
|
-
scriptNamesAlreadyPushedByUser.get(user).add(scriptName)
|
117
|
-
allInfo.push(info)
|
118
|
-
await writeFilePersistent(
|
119
|
-
resolve(hackmudDirectory, user, `scripts/${scriptName}.js`),
|
120
|
-
minifiedCode
|
121
|
-
)
|
122
|
-
onPush(info)
|
123
|
-
}
|
124
|
-
})
|
125
|
-
)
|
126
|
-
},
|
127
|
-
error => {
|
128
|
-
if ("ENOENT" != error.code) throw error
|
129
|
-
}
|
130
|
-
)
|
85
|
+
sourceFolderFolders.map(async ({ name: user, path }) => {
|
86
|
+
const files = (await readDirectoryWithStats(path)).filter(({ stats }) => stats.isFile()),
|
87
|
+
scriptFiles = [
|
88
|
+
...files.filter(({ name }) => name.endsWith(".js")),
|
89
|
+
...files.filter(({ name }) => name.endsWith(".ts"))
|
90
|
+
]
|
91
|
+
for (const { name, path } of scriptFiles) {
|
92
|
+
const scriptName = name.slice(0, -3)
|
93
|
+
;[...wildScriptUsers_, ...scriptNamesToUsers.get(scriptName)].includes(user) &&
|
94
|
+
usersToScriptsToPush.get(user).set(scriptName, path)
|
95
|
+
}
|
131
96
|
})
|
132
97
|
)
|
98
|
+
for (const [scriptName, users] of scriptNamesToUsers)
|
99
|
+
for (const user of users)
|
100
|
+
if (!usersToScriptsToPush.get(user).has(scriptName))
|
101
|
+
throw Error(`Could not find script ${user}.${scriptName} to push`)
|
102
|
+
const pathsToUsers = new Cache(_path => new Set())
|
103
|
+
for (const [user, scriptsToPush] of usersToScriptsToPush)
|
104
|
+
for (const path of scriptsToPush.values()) pathsToUsers.get(path).add(user)
|
105
|
+
const allInfo = []
|
133
106
|
await Promise.all(
|
134
|
-
[...
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
info = {
|
157
|
-
file: `${user}/${fileName}`,
|
158
|
-
users: [user],
|
159
|
-
minLength: countHackmudCharacters(minifiedCode),
|
160
|
-
error: void 0
|
161
|
-
}
|
162
|
-
allInfo.push(info)
|
163
|
-
await writeFilePersistent(
|
164
|
-
resolve(hackmudDirectory, user, "scripts", scriptName + ".js"),
|
165
|
-
minifiedCode
|
166
|
-
)
|
167
|
-
onPush(info)
|
168
|
-
} else usersByGlobalScriptsToPush.get(scriptName).add(user)
|
169
|
-
})
|
170
|
-
))
|
171
|
-
})
|
172
|
-
)
|
173
|
-
await (wildScriptUsers.size ?
|
174
|
-
Promise.all(
|
175
|
-
(sourceDirectoryDirents || (await readDirectoryWithStats(sourceDirectory))).map(
|
176
|
-
async ({ path, stats, name }) => {
|
177
|
-
if (name.endsWith(".d.ts")) return
|
178
|
-
const extension = extname(name)
|
179
|
-
if (!stats.isFile() || !supportedExtensions.includes(extension)) return
|
180
|
-
const scriptName = basename(name, extension),
|
181
|
-
usersToPushTo = [...wildScriptUsers, ...usersByGlobalScriptsToPush.get(scriptName)].filter(
|
182
|
-
user => !scriptNamesAlreadyPushedByUser.get(user).has(scriptName)
|
183
|
-
)
|
184
|
-
if (!usersToPushTo.length) return
|
185
|
-
const uniqueID = Math.floor(Math.random() * 2 ** 52)
|
186
|
-
.toString(36)
|
187
|
-
.padStart(11, "0"),
|
188
|
-
{ script: minifiedCode } = await processScript(await readFile(path, { encoding: "utf-8" }), {
|
189
|
-
minify,
|
190
|
-
scriptUser: !0,
|
191
|
-
scriptName,
|
192
|
-
uniqueID,
|
193
|
-
filePath: path,
|
194
|
-
mangleNames,
|
195
|
-
forceQuineCheats
|
196
|
-
}),
|
197
|
-
info = {
|
198
|
-
file: name,
|
199
|
-
users: usersToPushTo,
|
200
|
-
minLength: countHackmudCharacters(minifiedCode),
|
201
|
-
error: void 0
|
202
|
-
}
|
203
|
-
await Promise.all(
|
204
|
-
usersToPushTo.map(user =>
|
205
|
-
writeFilePersistent(
|
206
|
-
resolve(hackmudDirectory, user, `scripts/${scriptName}.js`),
|
207
|
-
minifiedCode
|
208
|
-
.replace(RegExp(`\\$${uniqueID}\\$SCRIPT_USER\\$`, "g"), user)
|
209
|
-
.replace(
|
210
|
-
RegExp(`\\$${uniqueID}\\$FULL_SCRIPT_NAME\\$`, "g"),
|
211
|
-
`${user}.${scriptName}`
|
212
|
-
)
|
213
|
-
)
|
214
|
-
)
|
107
|
+
[...pathsToUsers].map(async ([path, [...users]]) => {
|
108
|
+
const scriptName = basename(path.slice(0, -3)),
|
109
|
+
uniqueID = Math.floor(Math.random() * 2 ** 52)
|
110
|
+
.toString(36)
|
111
|
+
.padStart(11, "0"),
|
112
|
+
{ script: minifiedCode } = await processScript(await readFile(path, { encoding: "utf8" }), {
|
113
|
+
minify,
|
114
|
+
scriptUser: !0,
|
115
|
+
scriptName,
|
116
|
+
uniqueID,
|
117
|
+
filePath: path,
|
118
|
+
mangleNames,
|
119
|
+
forceQuineCheats
|
120
|
+
}),
|
121
|
+
info = { path, users, characterCount: countHackmudCharacters(minifiedCode), error: void 0 }
|
122
|
+
await Promise.all(
|
123
|
+
users.map(user =>
|
124
|
+
writeFilePersistent(
|
125
|
+
resolve(hackmudPath, user, `scripts/${scriptName}.js`),
|
126
|
+
minifiedCode
|
127
|
+
.replace(RegExp(`\\$${uniqueID}\\$SCRIPT_USER\\$`, "g"), user)
|
128
|
+
.replace(RegExp(`\\$${uniqueID}\\$FULL_SCRIPT_NAME\\$`, "g"), `${user}.${scriptName}`)
|
215
129
|
)
|
216
|
-
|
217
|
-
onPush(info)
|
218
|
-
}
|
130
|
+
)
|
219
131
|
)
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
for (const extension of supportedExtensions)
|
225
|
-
try {
|
226
|
-
fileName = `${scriptName}${extension}`
|
227
|
-
code = await readFile((filePath = resolve(sourceDirectory, fileName)), { encoding: "utf-8" })
|
228
|
-
break
|
229
|
-
} catch {}
|
230
|
-
if (code) {
|
231
|
-
const uniqueID = Math.floor(Math.random() * 2 ** 52)
|
232
|
-
.toString(36)
|
233
|
-
.padStart(11, "0"),
|
234
|
-
{ script: minifiedCode } = await processScript(code, {
|
235
|
-
minify,
|
236
|
-
scriptUser: !0,
|
237
|
-
scriptName,
|
238
|
-
uniqueID,
|
239
|
-
filePath,
|
240
|
-
mangleNames,
|
241
|
-
forceQuineCheats
|
242
|
-
}),
|
243
|
-
info = {
|
244
|
-
file: fileName,
|
245
|
-
users: [...users],
|
246
|
-
minLength: countHackmudCharacters(minifiedCode),
|
247
|
-
error: void 0
|
248
|
-
}
|
249
|
-
await Promise.all(
|
250
|
-
[...users].map(user =>
|
251
|
-
writeFilePersistent(
|
252
|
-
resolve(hackmudDirectory, user, `scripts/${scriptName}.js`),
|
253
|
-
minifiedCode
|
254
|
-
.replace(RegExp(`\\$${uniqueID}\\$SCRIPT_USER\\$`, "g"), user)
|
255
|
-
.replace(
|
256
|
-
RegExp(`\\$${uniqueID}\\$FULL_SCRIPT_NAME\\$`, "g"),
|
257
|
-
`${user}.${scriptName}`
|
258
|
-
)
|
259
|
-
)
|
260
|
-
)
|
261
|
-
)
|
262
|
-
allInfo.push(info)
|
263
|
-
onPush(info)
|
264
|
-
}
|
265
|
-
})
|
266
|
-
))
|
132
|
+
allInfo.push(info)
|
133
|
+
onPush(info)
|
134
|
+
})
|
135
|
+
)
|
267
136
|
return allInfo
|
268
137
|
}
|
269
|
-
export { push
|
138
|
+
export { push }
|
package/syncMacros.d.ts
CHANGED
package/syncMacros.js
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
import { readDirectoryWithStats } from "@samual/lib/readDirectoryWithStats"
|
2
2
|
import { readFile, stat, writeFile } from "fs/promises"
|
3
3
|
import { extname, basename, resolve } from "path"
|
4
|
-
|
4
|
+
async function syncMacros(hackmudPath) {
|
5
5
|
const files = await readDirectoryWithStats(hackmudPath),
|
6
6
|
macros = new Map(),
|
7
7
|
users = []
|
@@ -12,7 +12,7 @@ const syncMacros = async hackmudPath => {
|
|
12
12
|
case ".macros":
|
13
13
|
{
|
14
14
|
const [lines, date] = await Promise.all([
|
15
|
-
readFile(resolve(hackmudPath, file.name), { encoding: "
|
15
|
+
readFile(resolve(hackmudPath, file.name), { encoding: "utf8" }).then(file =>
|
16
16
|
file.split("\n")
|
17
17
|
),
|
18
18
|
stat(resolve(hackmudPath, file.name)).then(({ mtime }) => mtime)
|
@@ -40,4 +40,4 @@ const syncMacros = async hackmudPath => {
|
|
40
40
|
for (const user of users) writeFile(resolve(hackmudPath, user + ".macros"), macroFile)
|
41
41
|
return { macrosSynced, usersSynced: users.length }
|
42
42
|
}
|
43
|
-
export { syncMacros
|
43
|
+
export { syncMacros }
|