fixes typings for typescript usage (both CommonJS and ES6 modules) (#63)

* fixes typings for typescript usage (both CommonJS and ES6 modules)

* updated module resolution and test reference

* removed package-lock.json

* added default export to source file

* added missing test js file

* reverted some manual testing code

* reverted formatter changes to index.ts

Author: dodiego

src/FluentSchema.js

@@ -182,7 +182,7 @@ const S = (
   },
 })
 
-module.exports = {
+const fluentSchema = {
   ...BaseSchema(),
   FORMATS,
   TYPES,
@@ -197,3 +197,5 @@ module.exports = {
   null: () => S().null(),
   raw: fragment => S().raw(fragment),
 }
+module.exports = fluentSchema
+module.exports.default = fluentSchema

src/types/index.js

@@ -0,0 +1,70 @@
+// This file will be passed to the TypeScript CLI to verify our typings compile
+const S = require('../FluentSchema').default
+
+console.log('isFluentSchema:', S.object().isFluentSchema)
+const schema = S.object()
+  .id('http://foo.com/user')
+  .title('A User')
+  .description('A User desc')
+  .definition(
+    'address',
+    S.object()
+      .id('#address')
+      .prop('line1', S.anyOf([S.string(), S.null()])) // JSON Schema nullable
+      .prop('line2', S.string().raw({ nullable: true })) // Open API / Swagger  nullable
+      .prop('country')
+      .allOf([S.string()])
+      .prop('city')
+      .prop('zipcode')
+  )
+  .prop('username', S.string().pattern(/[a-z]*/g))
+  .prop('email', S.string().format('email'))
+  .prop(
+    'avatar',
+    S.string()
+      .contentEncoding('base64')
+      .contentMediaType('image/png')
+  )
+  .required()
+  .prop(
+    'password',
+    S.string()
+      .default('123456')
+      .minLength(6)
+      .maxLength(12)
+      .pattern('.*')
+  )
+  .required()
+  .prop('addresses', S.array().items([S.ref('#address')]))
+  .required()
+  .prop(
+    'role',
+    S.object()
+      .id('http://foo.com/role')
+      .prop('name')
+      .enum(['ADMIN', 'USER'])
+      .prop('permissions')
+  )
+  .required()
+  .prop('age', S.mixed(['string', 'integer']))
+  .ifThen(S.object().prop('age', S.string()), S.required(['age']))
+  .readOnly()
+  .writeOnly(true)
+  .valueOf()
+
+console.log('example:\n', JSON.stringify(schema))
+console.log('isFluentSchema:', S.object().isFluentSchema)
+
+const userBaseSchema = S.object()
+  .additionalProperties(false)
+  .prop('username', S.string())
+  .prop('password', S.string())
+
+const userSchema = S.object()
+  .prop('id', S.string().format('uuid'))
+  .prop('createdAt', S.string().format('time'))
+  .prop('updatedAt', S.string().format('time'))
+  .extend(userBaseSchema)
+  .valueOf()
+
+console.log('user:\n', JSON.stringify(userSchema))

src/types/index.ts

@@ -47,7 +47,10 @@ const schema = S.object()
       .prop('permissions')
   )
   .required()
-  .prop('age', S.mixed<NumberSchema & StringSchema>(['string', 'integer']))
+  .prop(
+    'age',
+    S.mixed<NumberSchema & StringSchema>(['string', 'integer'])
+  )
   .ifThen(S.object().prop('age', S.string()), S.required(['age']))
   .readOnly()
   .writeOnly(true)

src/types/tsconfig.json

@@ -1,10 +1,12 @@
 {
   "compilerOptions": {
     "target": "es6",
-    "module": "commonjs",
+    "module": "CommonJS",
     "esModuleInterop": true,
+    "checkJs": true,
+    "allowJs": true,
     "noEmit": true,
     "strict": true
   },
-  "files": ["./index.ts"]
+  "files": ["./index.ts", "index.js"]
 }