feat(lib): output subschema (#12)

Author: jonathanglasmeyer

src/index.js

@@ -8,6 +8,7 @@ import externalsSchema from './properties/externals'
 import nodeSchema from './properties/node'
 import pluginsSchema from './properties/plugins'
 import resolveSchema from './properties/resolve'
+import outputSchema from './properties/output'
 import { absolutePath } from './types'
 
 const schema = Joi.object({
@@ -23,7 +24,7 @@ const schema = Joi.object({
   loader: Joi.any(), // ?
   module: moduleSchema,
   node: nodeSchema,
-  output: Joi.any(),
+  output: outputSchema,
   plugins: pluginsSchema,
   profile: Joi.boolean(),
   recordsInputPath: absolutePath,
@@ -33,8 +34,8 @@ const schema = Joi.object({
   resolveLoader: resolveSchema.concat(Joi.object({
     moduleTemplates: Joi.array().items(Joi.string()),
   })),
-  stats: Joi.any(),
-  target: Joi.any(),
+  stats: Joi.any(), // TODO
+  target: Joi.any(), // TODO
 
   // Plugins
   postcss: Joi.any(),

src/properties/devtool/index.js

@@ -17,8 +17,6 @@ const DEVTOOL_REGEX = new RegExp(
   '(#@|@|#)?' +       // maybe one of the pragmas
   `(${options.join('|')})` // one of the options
 )
-console.info('[index.js] DEVTOOL_REGEX: ', DEVTOOL_REGEX)
-
 
 export default Joi
   .string()

src/properties/output/index.js

@@ -1,10 +1,28 @@
 import Joi from 'joi'
-
-// Not an absolute path (not starting with / and not containing /
-const notAPath = Joi.string().regex(/^(?!\/)[^\/]+$/)
+import { notAbsolutePath, absolutePath, urlPart } from '../../types'
 
 export default Joi.object({
-  filename: notAPath,
-  chunkFilename: notAPath,
+  filename: notAbsolutePath,
+  path: absolutePath,
+  publicPath: urlPart,
+  chunkFilename: notAbsolutePath,
+  sourceMapFilename: notAbsolutePath,
+  devtoolModuleFilenameTemplate: [notAbsolutePath, Joi.func()],
+  devtoolFallbackModuleFilenameTemplate: [notAbsolutePath, Joi.func()],
+  devtoolLineToLine: Joi.any(),
+  hotUpdateChunkFilename: notAbsolutePath,
+  hotUpdateMainFilename: notAbsolutePath,
+  jsonpFunction: Joi.string(),
+  hotUpdateFunction: Joi.string(),
+  pathinfo: Joi.bool(),
+  library: notAbsolutePath,
+  libraryTarget: Joi.string().valid(['var', 'this', 'commonjs', 'commonjs2', 'amd', 'umd']),
+  umdNamedDefine: Joi.bool(),
+  sourcePrefix: Joi.string(),
+  crossOriginLoading: Joi.alternatives().try([
+    Joi.bool().valid(false),
+    Joi.string().valid(['anonymous', 'use-credentials']),
+  ]).options({ language: { boolean: {
+    base: 'should be `false`, "anonymous" or "use-credentials"' } } }),
 })
 

src/properties/output/index.test.js

@@ -1,14 +1,110 @@
 import schema from './index'
 import { allValid, allInvalid } from '../../../test/utils'
+import { notAbsolutePath, absolutePath, urlPart } from '../../types'
 
 const validModuleConfigs = [
   // #0
-  // 'entry.js',
+  { filename: 'foo' },
+  // #1
+  { chunkFilename: 'foo' },
+  // #2
+  { path: 'foo/bar' },
+  // #3
+  { path: '/foo/bar' },
+  // #4
+  { publicPath: '/assets/' },
+  // #5
+  { publicPath: 'http://cdn.example.com/assets/[hash]/' },
+  // #6
+  { devtoolModuleFilenameTemplate: 'webpack:///[resourcePath]?[hash]' },
+  // #7
+  { devtoolModuleFilenameTemplate: () => {} },
+  // #8
+  { hotUpdateChunkFilename: '[id].[hash].hot-update.js' },
+  // #9
+  { hotUpdateMainFilename: '[hash].hot-update.json' },
+  // #10
+  { jsonpFunction: 'webpackJsonp' },
+  // #11
+  { hotUpdateFunction: 'webpackHotUpdate' },
+  // #12
+  { pathinfo: false },
+  // #13
+  { library: 'redux' },
+  // #14
+  { libraryTarget: 'commonjs' },
+  // #15
+  { crossOriginLoading: false },
+  // #16
+  { crossOriginLoading: 'anonymous' },
+
 ]
 
 const invalidModuleConfigs = [
   // #0
-  // { input: 1, error: { message: '"value" must be a string' } },
+  {
+    input: {
+      filename: '/foo/bar',
+    },
+    error: { message: `"filename" ${notAbsolutePath.message}` },
+  },
+  // #1
+  {
+    input: {
+      chunkFilename: '/foo/bar',
+    },
+    error: { message: `"chunkFilename" ${notAbsolutePath.message}` },
+  },
+  // #2
+  {
+    input: {
+      path: './foo/bar',
+    },
+    error: { message: `"path" ${absolutePath.message}` },
+  },
+  // #3
+  {
+    input: {
+      publicPath: './foo',
+    },
+    error: { message: `"publicPath" ${urlPart.message}` },
+  },
+  // #4
+  {
+    input: {
+      publicPath: '/foo',
+    },
+    error: { message: `"publicPath" ${urlPart.message}` },
+  },
+  // #5
+  {
+    input: {
+      devtoolModuleFilenameTemplate: '/foo',
+    },
+    error: { message: `"devtoolModuleFilenameTemplate" ${notAbsolutePath.message}` },
+  },
+  // #6
+  {
+    input: {
+      libraryTarget: 'comonjs',
+    },
+    error: { message: '"libraryTarget" must be one of [var, this, commonjs, commonjs2, amd, umd]' },
+  },
+  // #6
+  {
+    input: {
+      crossOriginLoading: 'annonymous',
+    },
+    error: { message: '"crossOriginLoading" should be `false`, "anonymous" or "use-credentials"' },
+  },
+  // #7
+  {
+    input: {
+      fileName: 'foo',
+    },
+    error: { message: '"fileName" is not allowed' },
+  },
+
 ]
 
 describe('output', () => {

src/types/absolutePath.js

@@ -1,7 +1,11 @@
 import Joi from 'joi'
 
-export default Joi
+const MESSAGE = 'must be an absolute path'
+const absolutePath = Joi
   .string()
   .regex(/^(?!\.?\.\/).+$/)
-  .options({ language: { string: { regex: { base: 'must be an absolute path' } } } })
+  .options({ language: { string: { regex: { base: MESSAGE } } } })
 
+absolutePath.message = MESSAGE
+
+export default absolutePath

src/types/index.js

@@ -1 +1,3 @@
 export { default as absolutePath } from './absolutePath'
+export { default as notAbsolutePath } from './notAbsolutePath'
+export { default as urlPart } from './urlPart'

src/types/notAbsolutePath.js

@@ -0,0 +1,12 @@
+import Joi from 'joi'
+
+const MESSAGE = 'must not start with leading slash. ' +
+  'You probably want to supply an absolute path here, but shouldn\'t.'
+
+const notAbsolutePath = Joi
+  .string()
+  .regex(/^(?!\/).+$/)
+  .options({ language: { string: { regex: { base: MESSAGE } } } })
+
+notAbsolutePath.message = MESSAGE
+export default notAbsolutePath

src/types/urlPart.js

@@ -0,0 +1,12 @@
+import Joi from 'joi'
+
+const MESSAGE = 'should end with a slash (example: "/assets/" or "http://cdn.example.com/assets/[hash]/")'
+const urlPart = Joi
+  .string()
+  .regex(/\/$/)
+  .options({ language: { string: { regex: { base: MESSAGE } } } })
+
+urlPart.message = MESSAGE
+
+export default urlPart
+

test/mocha.opts

@@ -1 +1 @@
---require test/setup
+--require test/setup -R dot