@zipadee/javascript 0.0.6 → 0.0.8
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/index.d.ts +1 -1
- package/index.js +1 -1
- package/lib/serve.d.ts +23 -21
- package/lib/serve.d.ts.map +1 -1
- package/lib/serve.js +74 -74
- package/lib/serve.js.map +1 -1
- package/package.json +3 -3
package/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export * from './lib/serve.js';
|
|
2
|
-
//# sourceMappingURL=index.d.ts.map
|
|
2
|
+
//# sourceMappingURL=index.d.ts.map
|
package/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export * from './lib/serve.js';
|
|
2
|
-
//# sourceMappingURL=index.js.map
|
|
2
|
+
//# sourceMappingURL=index.js.map
|
package/lib/serve.d.ts
CHANGED
|
@@ -1,27 +1,29 @@
|
|
|
1
|
-
import {type Middleware} from '@zipadee/core';
|
|
1
|
+
import { type Middleware } from '@zipadee/core';
|
|
2
2
|
export interface Options {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
3
|
+
/**
|
|
4
|
+
* Root directory to restrict file access. Defaults to the current working
|
|
5
|
+
* directory.
|
|
6
|
+
*/
|
|
7
|
+
root?: string;
|
|
8
|
+
/**
|
|
9
|
+
* Base path to resolve imports from. Defaults to the current working
|
|
10
|
+
* directory.
|
|
11
|
+
*/
|
|
12
|
+
base?: string;
|
|
13
|
+
/**
|
|
14
|
+
* Imports resolved to outside of the base path will be prefixed with this
|
|
15
|
+
* string. Defaults to `/__root__`.
|
|
16
|
+
*/
|
|
17
|
+
rootPathPrefix?: string;
|
|
18
|
+
/**
|
|
19
|
+
* Array of file extensions to transform. Defaults to `['.js', '.mjs']`.
|
|
20
|
+
*
|
|
21
|
+
* Other extensions are served as plain files.
|
|
22
|
+
*/
|
|
23
|
+
extensions?: string[];
|
|
22
24
|
}
|
|
23
25
|
/**
|
|
24
26
|
* Serve static JavaScript files from a `root` directory.
|
|
25
27
|
*/
|
|
26
28
|
export declare const serve: (opts: Options) => Middleware;
|
|
27
|
-
//# sourceMappingURL=serve.d.ts.map
|
|
29
|
+
//# sourceMappingURL=serve.d.ts.map
|
package/lib/serve.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/lib/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,UAAU,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/lib/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,UAAU,EAAC,MAAM,eAAe,CAAC;AAezD,MAAM,WAAW,OAAO;IACtB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAYD;;GAEG;AACH,eAAO,MAAM,KAAK,SAAU,OAAO,KAAG,UAmGrC,CAAC"}
|
package/lib/serve.js
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
import {HttpError} from '@zipadee/core';
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
pathIsHidden,
|
|
5
|
-
resolvePath,
|
|
6
|
-
stat,
|
|
7
|
-
} from '@zipadee/static/lib/utils.js';
|
|
1
|
+
import { HttpError } from '@zipadee/core';
|
|
2
|
+
import { decodePath, pathIsHidden, resolvePath, stat, } from '@zipadee/static/lib/utils.js';
|
|
3
|
+
import { send } from '@zipadee/static';
|
|
8
4
|
import fs from 'node:fs/promises';
|
|
9
5
|
import path from 'node:path';
|
|
10
|
-
import {parse, init} from 'es-module-lexer';
|
|
11
|
-
import {moduleResolve} from 'import-meta-resolve';
|
|
6
|
+
import { parse, init } from 'es-module-lexer';
|
|
7
|
+
import { moduleResolve } from 'import-meta-resolve';
|
|
12
8
|
await init;
|
|
13
9
|
// TODO:
|
|
14
10
|
// - Add caching for both specifier resolution and files
|
|
@@ -23,71 +19,75 @@ await init;
|
|
|
23
19
|
* Serve static JavaScript files from a `root` directory.
|
|
24
20
|
*/
|
|
25
21
|
export const serve = (opts) => {
|
|
26
|
-
|
|
27
|
-
opts.
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
return await next();
|
|
35
|
-
}
|
|
36
|
-
let filePath = decodePath(req.path);
|
|
37
|
-
const parsedPath = path.parse(filePath);
|
|
38
|
-
// Only serve JavaScript files
|
|
39
|
-
if (!extensions.includes(parsedPath.ext)) {
|
|
40
|
-
return await next();
|
|
41
|
-
}
|
|
42
|
-
if (filePath.startsWith(rootFolderName)) {
|
|
43
|
-
filePath = filePath.substring(rootFolderName.length);
|
|
44
|
-
filePath = filePath.slice(parsedPath.root.length);
|
|
45
|
-
filePath = resolvePath(root, filePath);
|
|
46
|
-
} else {
|
|
47
|
-
filePath = filePath.slice(parsedPath.root.length);
|
|
48
|
-
filePath = resolvePath(base, filePath);
|
|
49
|
-
}
|
|
50
|
-
if (pathIsHidden(base, filePath)) {
|
|
51
|
-
return await next();
|
|
52
|
-
}
|
|
53
|
-
const stats = await stat(filePath);
|
|
54
|
-
if (stats.isDirectory()) {
|
|
55
|
-
return await next();
|
|
56
|
-
}
|
|
57
|
-
const source = await fs.readFile(filePath, 'utf8');
|
|
58
|
-
const [imports, _exports, _facade, _hasModuleSyntax] = parse(
|
|
59
|
-
source,
|
|
60
|
-
filePath,
|
|
61
|
-
);
|
|
62
|
-
let output = '';
|
|
63
|
-
let lastIndex = 0;
|
|
64
|
-
for (const impt of imports) {
|
|
65
|
-
const {t: type, s: start, e: end, n: unescaped} = impt;
|
|
66
|
-
if (type === 1) {
|
|
67
|
-
// Static import
|
|
68
|
-
const importSpecifier = unescaped || source.substring(start, end);
|
|
69
|
-
const fileURL = new URL(filePath, 'file://');
|
|
70
|
-
const resolvedImportURL = moduleResolve(importSpecifier, fileURL);
|
|
71
|
-
const resolvedImportPath = resolvedImportURL.pathname;
|
|
72
|
-
if (!resolvedImportPath.startsWith(root)) {
|
|
73
|
-
console.log('A', resolvedImportPath);
|
|
74
|
-
throw new HttpError(500);
|
|
22
|
+
const root = opts.root === undefined ? process.cwd() : path.resolve(opts.root);
|
|
23
|
+
const base = opts.base === undefined ? root : resolvePath(root, opts.base);
|
|
24
|
+
const rootPathPrefix = opts.rootPathPrefix ?? '/__root__';
|
|
25
|
+
const extensions = opts.extensions ?? ['.js', '.mjs'];
|
|
26
|
+
return async (req, res, next) => {
|
|
27
|
+
if (!(req.method === 'HEAD' || req.method === 'GET')) {
|
|
28
|
+
// TODO: implement HEAD?
|
|
29
|
+
return await next();
|
|
75
30
|
}
|
|
76
|
-
let
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
31
|
+
let filePath = decodePath(req.path);
|
|
32
|
+
const mountedPath = req.url.pathname.substring(0, req.url.pathname.length - filePath.length);
|
|
33
|
+
const parsedPath = path.parse(filePath);
|
|
34
|
+
const transform = extensions.includes(parsedPath.ext);
|
|
35
|
+
if (filePath.startsWith(rootPathPrefix)) {
|
|
36
|
+
filePath = filePath.substring(rootPathPrefix.length);
|
|
37
|
+
filePath = filePath.slice(parsedPath.root.length);
|
|
38
|
+
filePath = resolvePath(root, filePath);
|
|
84
39
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
40
|
+
else {
|
|
41
|
+
filePath = filePath.slice(parsedPath.root.length);
|
|
42
|
+
filePath = resolvePath(base, filePath);
|
|
43
|
+
}
|
|
44
|
+
if (pathIsHidden(base, filePath)) {
|
|
45
|
+
return await next();
|
|
46
|
+
}
|
|
47
|
+
const stats = await stat(filePath);
|
|
48
|
+
if (stats.isDirectory()) {
|
|
49
|
+
return await next();
|
|
50
|
+
}
|
|
51
|
+
if (!transform) {
|
|
52
|
+
const relativePath = path.relative(root, filePath);
|
|
53
|
+
await send(req, res, relativePath, { root });
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const source = await fs.readFile(filePath, 'utf8');
|
|
57
|
+
const [imports, _exports, _facade, _hasModuleSyntax] = parse(source, filePath);
|
|
58
|
+
let output = '';
|
|
59
|
+
let lastIndex = 0;
|
|
60
|
+
for (const impt of imports) {
|
|
61
|
+
const { t: type, s: start, e: end, n: unescaped } = impt;
|
|
62
|
+
if (type === 1) {
|
|
63
|
+
// Static import
|
|
64
|
+
const importSpecifier = unescaped || source.substring(start, end);
|
|
65
|
+
// If the specifier is relative or absolute, we don't need to resolve it
|
|
66
|
+
if (importSpecifier.startsWith('.') ||
|
|
67
|
+
importSpecifier.startsWith('/')) {
|
|
68
|
+
output += `${source.substring(lastIndex, start)}${importSpecifier}`;
|
|
69
|
+
lastIndex = end;
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
72
|
+
const fileURL = new URL(filePath, 'file://');
|
|
73
|
+
const resolvedImportURL = moduleResolve(importSpecifier, fileURL);
|
|
74
|
+
const resolvedImportPath = resolvedImportURL.pathname;
|
|
75
|
+
if (!resolvedImportPath.startsWith(root)) {
|
|
76
|
+
throw new HttpError(500);
|
|
77
|
+
}
|
|
78
|
+
let resolvedimport;
|
|
79
|
+
if (resolvedImportPath.startsWith(base)) {
|
|
80
|
+
resolvedimport = resolvedImportPath.substring(base.length);
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
resolvedimport = path.join(mountedPath, rootPathPrefix, resolvedImportPath.substring(root.length));
|
|
84
|
+
}
|
|
85
|
+
output += `${source.substring(lastIndex, start)}${resolvedimport}`;
|
|
86
|
+
lastIndex = end;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
res.type = 'text/javascript';
|
|
90
|
+
res.body = output + source.substring(lastIndex);
|
|
91
|
+
};
|
|
92
92
|
};
|
|
93
|
-
//# sourceMappingURL=serve.js.map
|
|
93
|
+
//# sourceMappingURL=serve.js.map
|
package/lib/serve.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../src/lib/serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAkB,MAAM,eAAe,CAAC;AACzD,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,IAAI,GACL,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,KAAK,EAAE,IAAI,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAElD,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../src/lib/serve.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zipadee/javascript",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.8",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -56,8 +56,8 @@
|
|
|
56
56
|
}
|
|
57
57
|
},
|
|
58
58
|
"dependencies": {
|
|
59
|
-
"@zipadee/core": "^0.0.
|
|
60
|
-
"@zipadee/static": "^0.0.
|
|
59
|
+
"@zipadee/core": "^0.0.8",
|
|
60
|
+
"@zipadee/static": "^0.0.8",
|
|
61
61
|
"import-meta-resolve": "^4.1.0"
|
|
62
62
|
}
|
|
63
63
|
}
|