More publish fixes (AssemblyScript#945)

dcodeIO · web-flow · commit 7b5c8cf998d5 · 2019-11-09T04:53:38.000+01:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,7 +1,7 @@
 name: Publish
 on:
   schedule:
-  - cron: '0 0 * * *'
+  - cron: '0 4 * * *'
 jobs:
   publish:
     name: "Publish packages"
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 npm-debug.*
+dist/
 docs/
 node_modules/
 out/
 raw/
-.history
+.history
diff --git a/index.d.ts b/index.d.ts
@@ -1 +1,2 @@
+import "./src/glue/js"
 export * from "./src";
diff --git a/index.release.d.ts b/index.release.d.ts
@@ -0,0 +1,2 @@
+/// <reference path="./dist/assemblyscript.d.ts" />
+export * from "assemblyscript";
diff --git a/index.release.js b/index.release.js
@@ -0,0 +1 @@
+module.exports = require("./dist/assemblyscript");
diff --git a/package.json b/package.json
@@ -43,9 +43,9 @@
   "scripts": {
     "build": "npm run build:bundle && npm run build:dts",
     "build:bundle": "webpack --mode production --display-modules",
-    "build:dts": "node scripts/build-dts && tsc --noEmit tests/dts/index",
+    "build:dts": "node scripts/build-dts && tsc --noEmit --target ESNEXT --module commonjs --experimentalDecorators tests/require/index-release",
     "clean": "node scripts/clean",
-    "check": "npm run check:config && npm run check:compiler",
+    "check": "npm run check:config && npm run check:compiler && tsc --noEmit --target ESNEXT --module commonjs --experimentalDecorators tests/require/index",
     "check:config": "tsc --noEmit -p src --diagnostics --listFiles",
     "check:compiler": "tslint -c tslint.json --project src --formatters-dir lib/lint/formatters --format as",
     "test": "npm run test:parser && npm run test:compiler && npm run test:packages",
diff --git a/scripts/build-dts.js b/scripts/build-dts.js
@@ -488,6 +488,9 @@ const result = ts.transform(sourceFile, [
 ]);
 console.log("  replaced " + numReplaced + " AS types with JS types");
 
+if (!fs.existsSync(path.join(__dirname, "..", "dist"))) {
+    fs.mkdirSync(path.join(__dirname, "..", "dist"));
+}
 fs.writeFileSync(
     path.resolve(__dirname, "..", "dist", "assemblyscript.d.ts"),
     ts.createPrinter().printFile(result.transformed[0]),
diff --git a/scripts/release.js b/scripts/release.js
@@ -14,15 +14,17 @@ fs.writeFileSync(path.join(__dirname, "..", "package.json"), [
   JSON.stringify(pkg, null, 2), '\n'
 ].join(""));
 
-console.log("Updating index.js ...");
-fs.writeFileSync(path.join(__dirname, "..", "index.js"), [
-  'module.exports = require("./dist/assemblyscript");\n'
-].join(""));
+console.log("Copying index.release.js -> index.js ...");
+fs.copyFileSync(
+  path.join(__dirname, "..", "index.release.js"),
+  path.join(__dirname, "..", "index.js")
+);
 
-console.log("Updating index.d.ts ...");
-fs.writeFileSync(path.join(__dirname, "..", "index.d.ts"), [
-  '/// <reference path="./dist/assemblyscript.d.ts" />\n',
-  'export * from "assemblyscript";\n'
-].join(""));
+console.log("Copying index.release.d.ts -> index.d.ts ...");
+fs.copyFileSync(
+  path.join(__dirname, "..", "index.release.d.ts"),
+  path.join(__dirname, "..", "index.d.ts")
+);
 
-console.log("OK");
+// We are going to use these immediately, so, to be sure:
+setTimeout(() => console.log("OK"), 2000);
diff --git a/src/flow.ts b/src/flow.ts
@@ -345,7 +345,7 @@ export class Flow {
       local = parentFunction.addLocal(type);
     } else {
       if (temps && temps.length) {
-        local = temps.pop();
+        local = temps.pop()!;
         local.type = type;
         local.flags = CommonFlags.NONE;
       } else {
@@ -404,7 +404,7 @@ export class Flow {
   /** Gets the scoped local of the specified name. */
   getScopedLocal(name: string): Local | null {
     var scopedLocals = this.scopedLocals;
-    if (scopedLocals && scopedLocals.has(name)) return scopedLocals.get(name);
+    if (scopedLocals && scopedLocals.has(name)) return scopedLocals.get(name)!;
     return null;
   }
 
@@ -478,9 +478,9 @@ export class Flow {
   lookupLocal(name: string): Local | null {
     var current: Flow | null = this;
     var scope: Map<String,Local> | null;
-    do if ((scope = current.scopedLocals) && (scope.has(name))) return scope.get(name);
+    do if ((scope = current.scopedLocals) && (scope.has(name))) return scope.get(name)!;
     while (current = current.parent);
-    return this.parentFunction.localsByName.get(name);
+    return this.parentFunction.localsByName.get(name)!;
   }
 
   /** Looks up the element with the specified name relative to the scope of this flow. */
@@ -868,7 +868,7 @@ export class Flow {
       // overflows if the conversion does (globals are wrapped on set)
       case ExpressionId.GlobalGet: {
         // TODO: this is inefficient because it has to read a string
-        let global = assert(this.parentFunction.program.elementsByName.get(assert(getGlobalGetName(expr))));
+        let global = assert(this.parentFunction.program.elementsByName.get(assert(getGlobalGetName(expr)))!);
         assert(global.kind == ElementKind.GLOBAL);
         return canConversionOverflow(assert((<Global>global).type), type);
       }
diff --git a/src/glue/js/index.ts b/src/glue/js/index.ts
@@ -4,8 +4,6 @@
  * @preferred
  *//***/
 
-/// <reference path="./node.d.ts" />
-
 import "./binaryen"; // must be first so portable can pick up the memory implementation
 import "../../../std/portable/index";
 import "./float";
diff --git a/src/module.ts b/src/module.ts
@@ -1162,7 +1162,7 @@ export class Module {
     var cStr = this.allocStringCached(exportName);
     var k = segments.length;
     var segs = new Array<usize>(k);
-    var psvs = new Array<i8>(k);
+    var psvs = new Uint8Array(k);
     var offs = new Array<ExpressionRef>(k);
     var sizs = new Array<Index>(k);
     for (let i = 0; i < k; ++i) {
diff --git a/src/parser.ts b/src/parser.ts
@@ -380,7 +380,7 @@ export class Parser extends DiagnosticEmitter {
   /** Obtains the next file to parse. */
   nextFile(): string | null {
     var backlog = this.backlog;
-    return backlog.length ? backlog.shift() : null;
+    return backlog.length ? backlog.shift()! : null;
   }
 
   /** Obtains the dependee of the given imported file. */
diff --git a/src/program.ts b/src/program.ts
@@ -612,7 +612,7 @@ export class Program extends DiagnosticEmitter {
   getElementByDeclaration(declaration: DeclarationStatement): DeclaredElement | null {
     var elementsByDeclaration = this.elementsByDeclaration;
     return elementsByDeclaration.has(declaration)
-      ? elementsByDeclaration.get(declaration)
+      ? elementsByDeclaration.get(declaration)!
       : null;
   }
 
@@ -1123,7 +1123,7 @@ export class Program extends DiagnosticEmitter {
   /** Looks up the element of the specified name in the global scope. */
   lookupGlobal(name: string): Element | null {
     var elements = this.elementsByName;
-    if (elements.has(name)) return elements.get(name);
+    if (elements.has(name)) return elements.get(name)!;
     return null;
   }
 
@@ -2890,7 +2890,7 @@ export class Function extends TypedElement {
   /* @override */
   lookup(name: string): Element | null {
     var locals = this.localsByName;
-    if (locals.has(name)) return locals.get(name);
+    if (locals.has(name)) return locals.get(name)!;
     return this.parent.lookup(name);
   }
 
diff --git a/src/resolver.ts b/src/resolver.ts
@@ -880,7 +880,7 @@ export class Resolver extends DiagnosticEmitter {
     } else if (type != Type.void) {
       let wrapperClasses = this.program.wrapperClasses;
       assert(wrapperClasses.has(type));
-      return wrapperClasses.get(type);
+      return wrapperClasses.get(type)!;
     }
     return null;
   }
@@ -2171,15 +2171,15 @@ export class Resolver extends DiagnosticEmitter {
         );
         let wrapperClasses = this.program.wrapperClasses;
         assert(wrapperClasses.has(intType));
-        return wrapperClasses.get(intType);
+        return wrapperClasses.get(intType)!;
       }
       case LiteralKind.FLOAT: {
         this.currentThisExpression = node;
         this.currentElementExpression = null;
         let fltType = ctxType == Type.f32 ? Type.f32 : Type.f64;
         let wrapperClasses = this.program.wrapperClasses;
         assert(wrapperClasses.has(fltType));
-        return wrapperClasses.get(fltType);
+        return wrapperClasses.get(fltType)!;
       }
       case LiteralKind.STRING: {
         this.currentThisExpression = node;
@@ -2334,7 +2334,7 @@ export class Resolver extends DiagnosticEmitter {
   ): Element | null {
     var wrapperClasses = this.program.wrapperClasses;
     assert(wrapperClasses.has(Type.bool));
-    return wrapperClasses.get(Type.bool);
+    return wrapperClasses.get(Type.bool)!;
   }
 
   /** Resolves an instanceof expression to its static type. */
diff --git a/std/portable.json b/std/portable.json
@@ -1,9 +1,8 @@
 {
   "extends": "../tsconfig-base.json",
   "compilerOptions": {
-    "target": "es5",
+    "target": "esnext",
     "module": "commonjs",
-    "noLib": true,
     "allowJs": true,
     "downlevelIteration": true,
     "preserveConstEnums": true,
diff --git a/std/portable/index.d.ts b/std/portable/index.d.ts
diff --git a/tests/dts/index.ts b/tests/dts/index.ts
diff --git a/tests/require/index-release.ts b/tests/require/index-release.ts
diff --git a/tests/require/index.ts b/tests/require/index.ts

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+import "./src/glue/js"`
`1`	`2`	`export * from "./src";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+/// <reference path="./dist/assemblyscript.d.ts" />`
	`2`	`+export * from "assemblyscript";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports = require("./dist/assemblyscript");`