Skip to content

Commit 3c0be28

Browse files
authored
Clean up release dependencies (#950)
1 parent 15bb724 commit 3c0be28

File tree

10 files changed

+216
-48
lines changed

10 files changed

+216
-48
lines changed

Diff for: bin/asc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if (~tailArgs) {
1414
return;
1515
}
1616

17-
require("source-map-support").install();
17+
try { require("source-map-support").install(); } catch (e) {}
1818

1919
const asc = module.exports = require("../cli/asc.js");
2020
if (/\basc$/.test(process.argv[1])) {

Diff for: cli/asc.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ if (process.browser) process.cwd = function() { return "."; };
1717

1818
const fs = require("fs");
1919
const path = require("path");
20-
const utf8 = require("@protobufjs/utf8");
20+
const utf8 = require("./util/utf8");
2121
const colorsUtil = require("./util/colors");
2222
const optionsUtil = require("./util/options");
2323
const mkdirp = require("./util/mkdirp");
24+
const find = require("./util/find");
2425
const EOL = process.platform === "win32" ? "\r\n" : "\n";
2526
const SEP = process.platform === "win32" ? "\\" : "/";
2627

@@ -83,9 +84,9 @@ exports.defaultShrinkLevel = 1;
8384
/** Bundled library files. */
8485
exports.libraryFiles = exports.isBundle ? BUNDLE_LIBRARY : (() => { // set up if not a bundle
8586
const libDir = path.join(__dirname, "..", "std", "assembly");
86-
const libFiles = require("glob").sync("**/!(*.d).ts", { cwd: libDir });
8787
const bundled = {};
88-
libFiles.forEach(file => bundled[file.replace(/\.ts$/, "")] = fs.readFileSync(path.join(libDir, file), "utf8" ));
88+
find.files(libDir, find.TS_EXCEPT_DTS)
89+
.forEach(file => bundled[file.replace(/\.ts$/, "")] = fs.readFileSync(path.join(libDir, file), "utf8" ));
8990
return bundled;
9091
})();
9192

Diff for: cli/util/find.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function files(dirname: string, filter?: ((name: string) => bool) | RegExp): string[];
2+
export const TS: RegExp;
3+
export const TS_EXCEPT_DTS: RegExp;

Diff for: cli/util/find.js

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
const fs = require("fs");
2+
const path = require("path");
3+
4+
function findFiles(dirname, filter) {
5+
var out = [];
6+
fs.readdirSync(dirname).forEach(name => {
7+
if (fs.statSync(path.join(dirname, name)).isDirectory()) {
8+
findFiles(path.join(dirname, name), filter).forEach(iname => out.push(name + "/" + iname));
9+
} else if (!filter || typeof filter === "function" ? filter(name) : filter.test(name)) {
10+
out.push(name);
11+
}
12+
});
13+
return out;
14+
}
15+
16+
exports.files = findFiles;
17+
18+
exports.TS = /\.ts$/;
19+
exports.TS_EXCEPT_DTS = /[^\.][^\d]\.ts$/;

Diff for: cli/util/utf8.d.ts

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/**
2+
* Calculates the UTF8 byte length of a string.
3+
* @param {string} string String
4+
* @returns {number} Byte length
5+
*/
6+
export function length(string: string): number;
7+
8+
/**
9+
* Reads UTF8 bytes as a string.
10+
* @param {Uint8Array} buffer Source buffer
11+
* @param {number} start Source start
12+
* @param {number} end Source end
13+
* @returns {string} String read
14+
*/
15+
export function read(buffer: Uint8Array, start: number, end: number): string;
16+
17+
/**
18+
* Writes a string as UTF8 bytes.
19+
* @param {string} string Source string
20+
* @param {Uint8Array} buffer Destination buffer
21+
* @param {number} offset Destination offset
22+
* @returns {number} Bytes written
23+
*/
24+
export function write(string: string, buffer: Uint8Array, offset: number): number;

Diff for: cli/util/utf8.js

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
// @protobufjs/utf8
2+
3+
/**
4+
* A minimal UTF8 implementation for number arrays.
5+
* @memberof util
6+
* @namespace
7+
*/
8+
var utf8 = exports;
9+
10+
/**
11+
* Calculates the UTF8 byte length of a string.
12+
* @param {string} string String
13+
* @returns {number} Byte length
14+
*/
15+
utf8.length = function utf8_length(string) {
16+
var len = 0,
17+
c = 0;
18+
for (var i = 0; i < string.length; ++i) {
19+
c = string.charCodeAt(i);
20+
if (c < 128)
21+
len += 1;
22+
else if (c < 2048)
23+
len += 2;
24+
else if ((c & 0xFC00) === 0xD800 && (string.charCodeAt(i + 1) & 0xFC00) === 0xDC00) {
25+
++i;
26+
len += 4;
27+
} else
28+
len += 3;
29+
}
30+
return len;
31+
};
32+
33+
/**
34+
* Reads UTF8 bytes as a string.
35+
* @param {Uint8Array} buffer Source buffer
36+
* @param {number} start Source start
37+
* @param {number} end Source end
38+
* @returns {string} String read
39+
*/
40+
utf8.read = function utf8_read(buffer, start, end) {
41+
var len = end - start;
42+
if (len < 1)
43+
return "";
44+
var parts = null,
45+
chunk = [],
46+
i = 0, // char offset
47+
t; // temporary
48+
while (start < end) {
49+
t = buffer[start++];
50+
if (t < 128)
51+
chunk[i++] = t;
52+
else if (t > 191 && t < 224)
53+
chunk[i++] = (t & 31) << 6 | buffer[start++] & 63;
54+
else if (t > 239 && t < 365) {
55+
t = ((t & 7) << 18 | (buffer[start++] & 63) << 12 | (buffer[start++] & 63) << 6 | buffer[start++] & 63) - 0x10000;
56+
chunk[i++] = 0xD800 + (t >> 10);
57+
chunk[i++] = 0xDC00 + (t & 1023);
58+
} else
59+
chunk[i++] = (t & 15) << 12 | (buffer[start++] & 63) << 6 | buffer[start++] & 63;
60+
if (i > 8191) {
61+
(parts || (parts = [])).push(String.fromCharCode.apply(String, chunk));
62+
i = 0;
63+
}
64+
}
65+
if (parts) {
66+
if (i)
67+
parts.push(String.fromCharCode.apply(String, chunk.slice(0, i)));
68+
return parts.join("");
69+
}
70+
return String.fromCharCode.apply(String, chunk.slice(0, i));
71+
};
72+
73+
/**
74+
* Writes a string as UTF8 bytes.
75+
* @param {string} string Source string
76+
* @param {Uint8Array} buffer Destination buffer
77+
* @param {number} offset Destination offset
78+
* @returns {number} Bytes written
79+
*/
80+
utf8.write = function utf8_write(string, buffer, offset) {
81+
var start = offset,
82+
c1, // character 1
83+
c2; // character 2
84+
for (var i = 0; i < string.length; ++i) {
85+
c1 = string.charCodeAt(i);
86+
if (c1 < 128) {
87+
buffer[offset++] = c1;
88+
} else if (c1 < 2048) {
89+
buffer[offset++] = c1 >> 6 | 192;
90+
buffer[offset++] = c1 & 63 | 128;
91+
} else if ((c1 & 0xFC00) === 0xD800 && ((c2 = string.charCodeAt(i + 1)) & 0xFC00) === 0xDC00) {
92+
c1 = 0x10000 + ((c1 & 0x03FF) << 10) + (c2 & 0x03FF);
93+
++i;
94+
buffer[offset++] = c1 >> 18 | 240;
95+
buffer[offset++] = c1 >> 12 & 63 | 128;
96+
buffer[offset++] = c1 >> 6 & 63 | 128;
97+
buffer[offset++] = c1 & 63 | 128;
98+
} else {
99+
buffer[offset++] = c1 >> 12 | 224;
100+
buffer[offset++] = c1 >> 6 & 63 | 128;
101+
buffer[offset++] = c1 & 63 | 128;
102+
}
103+
}
104+
return offset - start;
105+
};

Diff for: index.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
try { require("source-map-support").install(); } catch (e) {}
12
require("ts-node").register({
23
project: require("path").join(__dirname, "src", "tsconfig.json"),
34
skipIgnore: true

0 commit comments

Comments
 (0)