Merge pull request #4690 from rescript-lang/fix_1436

bobzhang · web-flow · commit 99681793f5ab · 2020-09-16T10:45:41.000+08:00
allow . in file names to provide xx.ios.js/xx.android.js (#1436)
diff --git a/jscomp/bsb/templates/basic/bsconfig.json b/jscomp/bsb/templates/basic/bsconfig.json
@@ -4,13 +4,5 @@
   "sources": {
     "dir" : "src",
     "subdirs" : true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [
-  ],
-  "refmt": 3
+  }
 }
diff --git a/jscomp/build_tests/top/input.js b/jscomp/build_tests/top/input.js
@@ -14,7 +14,9 @@ var cmjTargets = output
   .filter(x => x.endsWith(".cmj"))
   .map(x => path.basename(x))
   .sort();
-
-assert.deepEqual(cmjTargets, ["demo.cmj", "hello00.cmj","hexll.cmj"]);
+cmjTargets.sort()
+var expected = ["demo.cmj", "hello00.cmj","hexll..cmj",'hexll.cmj']
+expected.sort()
+assert.deepEqual(cmjTargets, expected);
 
 
diff --git a/jscomp/build_tests/weird_names/.gitignore b/jscomp/build_tests/weird_names/.gitignore
@@ -0,0 +1,26 @@
+*.exe
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+*~
+*.annot
+*.cmj
+*.bak
+lib/bs
+*.mlast
+*.mliast
+.vscode
+.merlin
+.bsb.lock
diff --git a/jscomp/build_tests/weird_names/README.md b/jscomp/build_tests/weird_names/README.md
@@ -0,0 +1,13 @@
+
+
+# Build
+```
+npm run build
+```
+
+# Watch
+
+```
+npm run watch
+```
+
diff --git a/jscomp/build_tests/weird_names/bsconfig.json b/jscomp/build_tests/weird_names/bsconfig.json
@@ -0,0 +1,8 @@
+{
+  "name": "weird_names",
+  "version": "0.1.0",
+  "sources": {
+    "dir" : "src",
+    "subdirs" : true
+  }
+}
diff --git a/jscomp/build_tests/weird_names/input.js b/jscomp/build_tests/weird_names/input.js
@@ -0,0 +1,24 @@
+var cp = require("child_process");
+var assert = require("assert");
+var path = require("path");
+
+var out = cp.spawnSync(`bsb`, { encoding: "utf8" });
+
+console.log(out.stdout);
+assert.ok(out.stderr === "");
+
+let files = [
+  "_app.res",
+  "[...params_max_3].res",
+  "[...params].res",
+  "[[...params]].res",
+  "[slug_or_ID].res",
+  "404.res",
+];
+
+for (let f of files) {
+  let { name } = path.parse(f);
+  let m = `./lib/js/src/${name}.js`;
+  //   console.log(m);
+  assert.deepEqual(require(m), { a: 1 });
+}
diff --git a/jscomp/build_tests/weird_names/package.json b/jscomp/build_tests/weird_names/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "weird_names",
+  "version": "0.1.0",
+  "scripts": {
+    "clean": "bsb -clean-world",
+    "build": "bsb -make-world",
+    "watch": "bsb -make-world -w"
+  },
+  "keywords": [
+    "BuckleScript"
+  ],
+  "author": "",
+  "license": "MIT",
+  "devDependencies": {
+    "bs-platform": "^8.3.0-dev.2"
+  }
+}
diff --git a/jscomp/build_tests/weird_names/src/404.res b/jscomp/build_tests/weird_names/src/404.res
@@ -0,0 +1 @@
+let a = 1
diff --git a/jscomp/build_tests/weird_names/src/[...params].res b/jscomp/build_tests/weird_names/src/[...params].res
@@ -0,0 +1 @@
+let a = 1
diff --git a/jscomp/build_tests/weird_names/src/[...params_max_3].res b/jscomp/build_tests/weird_names/src/[...params_max_3].res
@@ -0,0 +1 @@
+let a = 1
diff --git a/jscomp/build_tests/weird_names/src/[[...params]].res b/jscomp/build_tests/weird_names/src/[[...params]].res
@@ -0,0 +1 @@
+let a = 1
diff --git a/jscomp/build_tests/weird_names/src/[slug_or_ID].res b/jscomp/build_tests/weird_names/src/[slug_or_ID].res
@@ -0,0 +1 @@
+let a = 1
diff --git a/jscomp/build_tests/weird_names/src/_app.res b/jscomp/build_tests/weird_names/src/_app.res
@@ -0,0 +1 @@
+let a = 1
diff --git a/jscomp/build_tests/weird_names/src/demo.ml b/jscomp/build_tests/weird_names/src/demo.ml
@@ -0,0 +1 @@
+let a = 1
diff --git a/jscomp/ext/ext_filename.ml b/jscomp/ext/ext_filename.ml
@@ -124,7 +124,7 @@ let rec valid_module_name_aux name off len =
   else 
     let c = String.unsafe_get name off in 
     match c with 
-    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> 
+    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' | '.' | '[' | ']' -> 
       valid_module_name_aux name (off + 1) len 
     | _ -> false
 
@@ -145,6 +145,9 @@ let valid_module_name name len =
       else Invalid  
     | 'a' .. 'z' 
     | '0' .. '9'
+    | '_'
+    | '[' 
+    | ']'
       -> 
       if valid_module_name_aux name 1 len then
         Lower
diff --git a/jscomp/ounit_tests/ounit_string_tests.ml b/jscomp/ounit_tests/ounit_string_tests.ml
@@ -87,7 +87,7 @@ let suites =
       Ext_filename.module_name "a/hello.ml" =~ "Hello";
       Ext_filename.as_module ~basename:"a.ml" =~ Some {module_name = "A"; case = false};
       Ext_filename.as_module ~basename:"Aa.ml" =~ Some {module_name = "Aa"; case = true};
-      Ext_filename.as_module ~basename:"_Aa.ml" =~ None;
+      (* Ext_filename.as_module ~basename:"_Aa.ml" =~ None; *)
       Ext_filename.as_module ~basename:"A_a" =~ Some {module_name = "A_a"; case = true};
       Ext_filename.as_module ~basename:"" =~ None;
       Ext_filename.as_module ~basename:"a/hello.ml" =~ 
diff --git a/lib/4.06.1/bsb.ml b/lib/4.06.1/bsb.ml
@@ -6799,7 +6799,7 @@ let rec valid_module_name_aux name off len =
   else 
     let c = String.unsafe_get name off in 
     match c with 
-    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> 
+    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' | '.' | '[' | ']' -> 
       valid_module_name_aux name (off + 1) len 
     | _ -> false
 
@@ -6820,6 +6820,9 @@ let valid_module_name name len =
       else Invalid  
     | 'a' .. 'z' 
     | '0' .. '9'
+    | '_'
+    | '[' 
+    | ']'
       -> 
       if valid_module_name_aux name 1 len then
         Lower
diff --git a/lib/4.06.1/bsb_helper.ml b/lib/4.06.1/bsb_helper.ml
@@ -2115,7 +2115,7 @@ let rec valid_module_name_aux name off len =
   else 
     let c = String.unsafe_get name off in 
     match c with 
-    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> 
+    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' | '.' | '[' | ']' -> 
       valid_module_name_aux name (off + 1) len 
     | _ -> false
 
@@ -2136,6 +2136,9 @@ let valid_module_name name len =
       else Invalid  
     | 'a' .. 'z' 
     | '0' .. '9'
+    | '_'
+    | '[' 
+    | ']'
       -> 
       if valid_module_name_aux name 1 len then
         Lower
diff --git a/lib/4.06.1/unstable/all_ounit_tests.ml b/lib/4.06.1/unstable/all_ounit_tests.ml
@@ -16266,7 +16266,7 @@ let rec valid_module_name_aux name off len =
   else 
     let c = String.unsafe_get name off in 
     match c with 
-    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> 
+    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' | '.' | '[' | ']' -> 
       valid_module_name_aux name (off + 1) len 
     | _ -> false
 
@@ -16287,6 +16287,9 @@ let valid_module_name name len =
       else Invalid  
     | 'a' .. 'z' 
     | '0' .. '9'
+    | '_'
+    | '[' 
+    | ']'
       -> 
       if valid_module_name_aux name 1 len then
         Lower
@@ -16815,7 +16818,7 @@ let suites =
       Ext_filename.module_name "a/hello.ml" =~ "Hello";
       Ext_filename.as_module ~basename:"a.ml" =~ Some {module_name = "A"; case = false};
       Ext_filename.as_module ~basename:"Aa.ml" =~ Some {module_name = "Aa"; case = true};
-      Ext_filename.as_module ~basename:"_Aa.ml" =~ None;
+      (* Ext_filename.as_module ~basename:"_Aa.ml" =~ None; *)
       Ext_filename.as_module ~basename:"A_a" =~ Some {module_name = "A_a"; case = true};
       Ext_filename.as_module ~basename:"" =~ None;
       Ext_filename.as_module ~basename:"a/hello.ml" =~ 
diff --git a/lib/4.06.1/unstable/bspack.ml b/lib/4.06.1/unstable/bspack.ml
@@ -10255,7 +10255,7 @@ let rec valid_module_name_aux name off len =
   else 
     let c = String.unsafe_get name off in 
     match c with 
-    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> 
+    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' | '.' | '[' | ']' -> 
       valid_module_name_aux name (off + 1) len 
     | _ -> false
 
@@ -10276,6 +10276,9 @@ let valid_module_name name len =
       else Invalid  
     | 'a' .. 'z' 
     | '0' .. '9'
+    | '_'
+    | '[' 
+    | ']'
       -> 
       if valid_module_name_aux name 1 len then
         Lower
diff --git a/lib/4.06.1/unstable/js_compiler.ml b/lib/4.06.1/unstable/js_compiler.ml
@@ -69416,7 +69416,7 @@ let rec valid_module_name_aux name off len =
   else 
     let c = String.unsafe_get name off in 
     match c with 
-    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> 
+    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' | '.' | '[' | ']' -> 
       valid_module_name_aux name (off + 1) len 
     | _ -> false
 
@@ -69437,6 +69437,9 @@ let valid_module_name name len =
       else Invalid  
     | 'a' .. 'z' 
     | '0' .. '9'
+    | '_'
+    | '[' 
+    | ']'
       -> 
       if valid_module_name_aux name 1 len then
         Lower
diff --git a/lib/4.06.1/unstable/js_refmt_compiler.ml b/lib/4.06.1/unstable/js_refmt_compiler.ml
@@ -69416,7 +69416,7 @@ let rec valid_module_name_aux name off len =
   else 
     let c = String.unsafe_get name off in 
     match c with 
-    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> 
+    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' | '.' | '[' | ']' -> 
       valid_module_name_aux name (off + 1) len 
     | _ -> false
 
@@ -69437,6 +69437,9 @@ let valid_module_name name len =
       else Invalid  
     | 'a' .. 'z' 
     | '0' .. '9'
+    | '_'
+    | '[' 
+    | ']'
       -> 
       if valid_module_name_aux name 1 len then
         Lower
diff --git a/lib/4.06.1/whole_compiler.ml b/lib/4.06.1/whole_compiler.ml
@@ -294966,7 +294966,7 @@ let rec valid_module_name_aux name off len =
   else 
     let c = String.unsafe_get name off in 
     match c with 
-    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' -> 
+    | 'A'..'Z' | 'a'..'z' | '0'..'9' | '_' | '\'' | '.' | '[' | ']' -> 
       valid_module_name_aux name (off + 1) len 
     | _ -> false
 
@@ -294987,6 +294987,9 @@ let valid_module_name name len =
       else Invalid  
     | 'a' .. 'z' 
     | '0' .. '9'
+    | '_'
+    | '[' 
+    | ']'
       -> 
       if valid_module_name_aux name 1 len then
         Lower

-Original file line number
+Diff line change
@@ @@ -0,0 +1,13 @@ @@
++
++
 +# Build
 +```
 +npm run build
 +```
++
 +# Watch
++
 +```
 +npm run watch
 +```
++