Refactor to facilitate amd modules.#168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xavierzwirtz wants to merge 8 commits into
base:master
Choose a base branch
from
Open

Refactor to facilitate amd modules. #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1e4fb3
Included FunScript.Compiler in solution.
Feb 13, 2015
c314218
Refactor of argument verification to use more functional techniques.
Feb 13, 2015
308de3c
WIP Compiler upgrade.
Feb 13, 2015
f1102b5
Added CompileAssembly to FunScript.Compiler
Feb 15, 2015
4827b01
Switched FunScript.Compiler to not reference FunScript itself. Instea…
Feb 16, 2015
8b2f983
WIP amd module implementation.
Feb 22, 2015
76f5a02
Fixed moduels being overwritten.
Feb 23, 2015
fdfef6a
Implemented ordering of out put by dependency.
Feb 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/FunScript.sln
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.30324.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript", "main\FunScript\FunScript.fsproj", "{E0916E67-D3B0-4C3A-AD18-4146882FCEDD}"
EndProject
Expand All@@ -13,6 +13,14 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Interop", "main\F
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Rx", "extra\FunScript.Rx\FunScript.Rx.fsproj", "{3D25CAB2-83A4-4D3B-9986-AC068FE29307}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Compiler", "extra\FunScript.Compiler\FunScript.Compiler.fsproj", "{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CompileTestData", "CompileTestData", "{71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Simple", "compileTestData\simple\Simple.fsproj", "{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WithBindings", "compileTestData\WithBindings\WithBindings.fsproj", "{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All@@ -39,10 +47,26 @@ Global
{3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.Build.0 = Release|Any CPU
{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.Build.0 = Release|Any CPU
{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.Build.0 = Release|Any CPU
{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
$0.TextStylePolicy = $2
$1.inheritsSet = null
Expand Down
14 changes: 14 additions & 0 deletions src/compileTestData/Simple/App.config
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
18 changes: 18 additions & 0 deletions src/compileTestData/Simple/Program.fs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
[<ReflectedDefinition>]
module Page

module x =
let makeHello who =
sprintf "hello %s" who

module y =
let yMakeHello who =
x.makeHello who
module z =
let zMakeHello who =
x.makeHello who

[<FunScript.AssemblyMain>]
let main() =
let hello = y.z.zMakeHello "world"
hello
88 changes: 88 additions & 0 deletions src/compileTestData/Simple/Simple.fsproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>e8eda6fd-20d3-4849-95da-ed2b0ae0a869</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Simple</RootNamespace>
<AssemblyName>Simple</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
<Name>Simple</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Debug\Simple.XML</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Release\Simple.XML</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.fs" />
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
<Name>FunScript.TypeScript</Name>
<Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
<Name>FunScript</Name>
<Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
</PropertyGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '11.0'">
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</Otherwise>
</Choose>
<Import Project="$(FSharpTargetsPath)" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
14 changes: 14 additions & 0 deletions src/compileTestData/WithBindings/App.config
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
15 changes: 15 additions & 0 deletions src/compileTestData/WithBindings/Program.fs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
[<ReflectedDefinition>]
module Page

open FunScript
open FunScript.TypeScript

let hello () =
Globals.window.alert("Hello world!")

let jq(selector : string) = Globals.Dollar.Invoke selector
let (?) jq name = jq("#" + name)

[<FunScript.AssemblyMain>]
let main() =
jq?helloWorld.click(fun _ -> hello() :> obj)
97 changes: 97 additions & 0 deletions src/compileTestData/WithBindings/WithBindings.fsproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5bb88a86-e7de-43ba-b809-a0dddad7f21c}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>WithBindings</RootNamespace>
<AssemblyName>WithBindings</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
<Name>WithBindings</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Debug\WithBindings.XML</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<DocumentationFile>bin\Release\WithBindings.XML</DocumentationFile>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="FunScript.TypeScript.Binding.jquery">
<HintPath>..\..\packages\FunScript.TypeScript.Binding.jquery.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.jquery.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FunScript.TypeScript.Binding.lib">
<HintPath>..\..\packages\FunScript.TypeScript.Binding.lib.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.lib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.fs" />
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
<Name>FunScript.TypeScript</Name>
<Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
<Name>FunScript</Name>
<Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
</PropertyGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '11.0'">
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
</Otherwise>
</Choose>
<Import Project="$(FSharpTargetsPath)" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
5 changes: 5 additions & 0 deletions src/compileTestData/WithBindings/packages.config
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FunScript.TypeScript.Binding.jquery" version="1.1.0.37" targetFramework="net45" />
<package id="FunScript.TypeScript.Binding.lib" version="1.1.0.37" targetFramework="net45" />
</packages>
10 changes: 5 additions & 5 deletions src/extra/FunScript.Compiler/App.config
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0"/>
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>

</dependentAssembly>
</assemblyBinding>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Refactor to facilitate amd modules.#168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

xavierzwirtz
wants to merge
8
commits into

base:master
Choose a base branch

from

 Open


Refactor to facilitate amd modules.
#168
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1e4fb3

Included FunScript.Compiler in solution.

Feb 13, 2015
c314218

Refactor of argument verification to use more functional techniques.

Feb 13, 2015
308de3c

WIP Compiler upgrade.

Feb 13, 2015
f1102b5

Added CompileAssembly to FunScript.Compiler

Feb 15, 2015
4827b01

Switched FunScript.Compiler to not reference FunScript itself. Instea…

Feb 16, 2015
8b2f983

WIP amd module implementation.

Feb 22, 2015
76f5a02

Fixed moduels being overwritten.

Feb 23, 2015
fdfef6a

Implemented ordering of out put by dependency.

Feb 26, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 25 additions & 1 deletion
src/FunScript.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.30324.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript", "main\FunScript\FunScript.fsproj", "{E0916E67-D3B0-4C3A-AD18-4146882FCEDD}"
EndProject
Expand All@@ -13,6 +13,14 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Interop", "main\F
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Rx", "extra\FunScript.Rx\FunScript.Rx.fsproj", "{3D25CAB2-83A4-4D3B-9986-AC068FE29307}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Compiler", "extra\FunScript.Compiler\FunScript.Compiler.fsproj", "{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CompileTestData", "CompileTestData", "{71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Simple", "compileTestData\simple\Simple.fsproj", "{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WithBindings", "compileTestData\WithBindings\WithBindings.fsproj", "{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand All@@ -39,10 +47,26 @@ Global
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.Build.0 = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.Build.0 = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.Build.0 = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
	EndGlobalSection
	GlobalSection(NestedProjects) = preSolution
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
	EndGlobalSection
	GlobalSection(MonoDevelopProperties) = preSolution
 $0.TextStylePolicy = $2
 $1.inheritsSet = null
Expand Down

14 changes: 14 additions & 0 deletions
src/compileTestData/Simple/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

18 changes: 18 additions & 0 deletions
src/compileTestData/Simple/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
[<ReflectedDefinition>]
module Page

module x = 
 let makeHello who = 
 sprintf "hello %s" who

module y = 
 let yMakeHello who = 
 x.makeHello who
 module z =
 let zMakeHello who = 
 x.makeHello who

[<FunScript.AssemblyMain>]
let main() = 
 let hello = y.z.zMakeHello "world"
 hello

88 changes: 88 additions & 0 deletions
src/compileTestData/Simple/Simple.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>e8eda6fd-20d3-4849-95da-ed2b0ae0a869</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>Simple</RootNamespace>
 <AssemblyName>Simple</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>Simple</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

14 changes: 14 additions & 0 deletions
src/compileTestData/WithBindings/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

15 changes: 15 additions & 0 deletions
src/compileTestData/WithBindings/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
[<ReflectedDefinition>]
module Page

open FunScript
open FunScript.TypeScript

let hello () =
 Globals.window.alert("Hello world!")

let jq(selector : string) = Globals.Dollar.Invoke selector
let (?) jq name = jq("#" + name)

[<FunScript.AssemblyMain>]
let main() = 
 jq?helloWorld.click(fun _ -> hello() :> obj)

97 changes: 97 additions & 0 deletions
src/compileTestData/WithBindings/WithBindings.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>{5bb88a86-e7de-43ba-b809-a0dddad7f21c}</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>WithBindings</RootNamespace>
 <AssemblyName>WithBindings</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>WithBindings</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="FunScript.TypeScript.Binding.jquery">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.jquery.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.jquery.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="FunScript.TypeScript.Binding.lib">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.lib.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.lib.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 <None Include="packages.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

5 changes: 5 additions & 0 deletions
src/compileTestData/WithBindings/packages.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
 <package id="FunScript.TypeScript.Binding.jquery" version="1.1.0.37" targetFramework="net45" />
 <package id="FunScript.TypeScript.Binding.lib" version="1.1.0.37" targetFramework="net45" />
</packages>

10 changes: 5 additions & 5 deletions
src/extra/FunScript.Compiler/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>

 </dependentAssembly>
 </assemblyBinding>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor to facilitate amd modules.#168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

xavierzwirtz
wants to merge
8
commits into

base:master
Choose a base branch

from

 Open


Refactor to facilitate amd modules.
#168
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1e4fb3

Included FunScript.Compiler in solution.

Feb 13, 2015
c314218

Refactor of argument verification to use more functional techniques.

Feb 13, 2015
308de3c

WIP Compiler upgrade.

Feb 13, 2015
f1102b5

Added CompileAssembly to FunScript.Compiler

Feb 15, 2015
4827b01

Switched FunScript.Compiler to not reference FunScript itself. Instea…

Feb 16, 2015
8b2f983

WIP amd module implementation.

Feb 22, 2015
76f5a02

Fixed moduels being overwritten.

Feb 23, 2015
fdfef6a

Implemented ordering of out put by dependency.

Feb 26, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 25 additions & 1 deletion
src/FunScript.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.30324.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript", "main\FunScript\FunScript.fsproj", "{E0916E67-D3B0-4C3A-AD18-4146882FCEDD}"
EndProject
Expand All@@ -13,6 +13,14 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Interop", "main\F
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Rx", "extra\FunScript.Rx\FunScript.Rx.fsproj", "{3D25CAB2-83A4-4D3B-9986-AC068FE29307}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Compiler", "extra\FunScript.Compiler\FunScript.Compiler.fsproj", "{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CompileTestData", "CompileTestData", "{71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Simple", "compileTestData\simple\Simple.fsproj", "{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WithBindings", "compileTestData\WithBindings\WithBindings.fsproj", "{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand All@@ -39,10 +47,26 @@ Global
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.Build.0 = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.Build.0 = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.Build.0 = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
	EndGlobalSection
	GlobalSection(NestedProjects) = preSolution
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
	EndGlobalSection
	GlobalSection(MonoDevelopProperties) = preSolution
 $0.TextStylePolicy = $2
 $1.inheritsSet = null
Expand Down

14 changes: 14 additions & 0 deletions
src/compileTestData/Simple/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

18 changes: 18 additions & 0 deletions
src/compileTestData/Simple/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
[<ReflectedDefinition>]
module Page

module x = 
 let makeHello who = 
 sprintf "hello %s" who

module y = 
 let yMakeHello who = 
 x.makeHello who
 module z =
 let zMakeHello who = 
 x.makeHello who

[<FunScript.AssemblyMain>]
let main() = 
 let hello = y.z.zMakeHello "world"
 hello

88 changes: 88 additions & 0 deletions
src/compileTestData/Simple/Simple.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>e8eda6fd-20d3-4849-95da-ed2b0ae0a869</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>Simple</RootNamespace>
 <AssemblyName>Simple</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>Simple</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

14 changes: 14 additions & 0 deletions
src/compileTestData/WithBindings/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

15 changes: 15 additions & 0 deletions
src/compileTestData/WithBindings/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
[<ReflectedDefinition>]
module Page

open FunScript
open FunScript.TypeScript

let hello () =
 Globals.window.alert("Hello world!")

let jq(selector : string) = Globals.Dollar.Invoke selector
let (?) jq name = jq("#" + name)

[<FunScript.AssemblyMain>]
let main() = 
 jq?helloWorld.click(fun _ -> hello() :> obj)

97 changes: 97 additions & 0 deletions
src/compileTestData/WithBindings/WithBindings.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>{5bb88a86-e7de-43ba-b809-a0dddad7f21c}</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>WithBindings</RootNamespace>
 <AssemblyName>WithBindings</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>WithBindings</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="FunScript.TypeScript.Binding.jquery">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.jquery.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.jquery.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="FunScript.TypeScript.Binding.lib">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.lib.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.lib.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 <None Include="packages.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

5 changes: 5 additions & 0 deletions
src/compileTestData/WithBindings/packages.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
 <package id="FunScript.TypeScript.Binding.jquery" version="1.1.0.37" targetFramework="net45" />
 <package id="FunScript.TypeScript.Binding.lib" version="1.1.0.37" targetFramework="net45" />
</packages>

10 changes: 5 additions & 5 deletions
src/extra/FunScript.Compiler/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>

 </dependentAssembly>
 </assemblyBinding>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor to facilitate amd modules.#168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

xavierzwirtz
wants to merge
8
commits into

base:master
Choose a base branch

from

 Open


Refactor to facilitate amd modules.
#168
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1e4fb3

Included FunScript.Compiler in solution.

Feb 13, 2015
c314218

Refactor of argument verification to use more functional techniques.

Feb 13, 2015
308de3c

WIP Compiler upgrade.

Feb 13, 2015
f1102b5

Added CompileAssembly to FunScript.Compiler

Feb 15, 2015
4827b01

Switched FunScript.Compiler to not reference FunScript itself. Instea…

Feb 16, 2015
8b2f983

WIP amd module implementation.

Feb 22, 2015
76f5a02

Fixed moduels being overwritten.

Feb 23, 2015
fdfef6a

Implemented ordering of out put by dependency.

Feb 26, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 25 additions & 1 deletion
src/FunScript.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.30324.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript", "main\FunScript\FunScript.fsproj", "{E0916E67-D3B0-4C3A-AD18-4146882FCEDD}"
EndProject
Expand All@@ -13,6 +13,14 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Interop", "main\F
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Rx", "extra\FunScript.Rx\FunScript.Rx.fsproj", "{3D25CAB2-83A4-4D3B-9986-AC068FE29307}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Compiler", "extra\FunScript.Compiler\FunScript.Compiler.fsproj", "{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CompileTestData", "CompileTestData", "{71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Simple", "compileTestData\simple\Simple.fsproj", "{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WithBindings", "compileTestData\WithBindings\WithBindings.fsproj", "{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand All@@ -39,10 +47,26 @@ Global
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.Build.0 = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.Build.0 = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.Build.0 = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
	EndGlobalSection
	GlobalSection(NestedProjects) = preSolution
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
	EndGlobalSection
	GlobalSection(MonoDevelopProperties) = preSolution
 $0.TextStylePolicy = $2
 $1.inheritsSet = null
Expand Down

14 changes: 14 additions & 0 deletions
src/compileTestData/Simple/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

18 changes: 18 additions & 0 deletions
src/compileTestData/Simple/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
[<ReflectedDefinition>]
module Page

module x = 
 let makeHello who = 
 sprintf "hello %s" who

module y = 
 let yMakeHello who = 
 x.makeHello who
 module z =
 let zMakeHello who = 
 x.makeHello who

[<FunScript.AssemblyMain>]
let main() = 
 let hello = y.z.zMakeHello "world"
 hello

88 changes: 88 additions & 0 deletions
src/compileTestData/Simple/Simple.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>e8eda6fd-20d3-4849-95da-ed2b0ae0a869</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>Simple</RootNamespace>
 <AssemblyName>Simple</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>Simple</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

14 changes: 14 additions & 0 deletions
src/compileTestData/WithBindings/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

15 changes: 15 additions & 0 deletions
src/compileTestData/WithBindings/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
[<ReflectedDefinition>]
module Page

open FunScript
open FunScript.TypeScript

let hello () =
 Globals.window.alert("Hello world!")

let jq(selector : string) = Globals.Dollar.Invoke selector
let (?) jq name = jq("#" + name)

[<FunScript.AssemblyMain>]
let main() = 
 jq?helloWorld.click(fun _ -> hello() :> obj)

97 changes: 97 additions & 0 deletions
src/compileTestData/WithBindings/WithBindings.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>{5bb88a86-e7de-43ba-b809-a0dddad7f21c}</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>WithBindings</RootNamespace>
 <AssemblyName>WithBindings</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>WithBindings</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="FunScript.TypeScript.Binding.jquery">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.jquery.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.jquery.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="FunScript.TypeScript.Binding.lib">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.lib.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.lib.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 <None Include="packages.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

5 changes: 5 additions & 0 deletions
src/compileTestData/WithBindings/packages.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
 <package id="FunScript.TypeScript.Binding.jquery" version="1.1.0.37" targetFramework="net45" />
 <package id="FunScript.TypeScript.Binding.lib" version="1.1.0.37" targetFramework="net45" />
</packages>

10 changes: 5 additions & 5 deletions
src/extra/FunScript.Compiler/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>

 </dependentAssembly>
 </assemblyBinding>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Refactor to facilitate amd modules.#168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

xavierzwirtz
wants to merge
8
commits into

base:master
Choose a base branch

from

 Open


Refactor to facilitate amd modules.
#168
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1e4fb3

Included FunScript.Compiler in solution.

Feb 13, 2015
c314218

Refactor of argument verification to use more functional techniques.

Feb 13, 2015
308de3c

WIP Compiler upgrade.

Feb 13, 2015
f1102b5

Added CompileAssembly to FunScript.Compiler

Feb 15, 2015
4827b01

Switched FunScript.Compiler to not reference FunScript itself. Instea…

Feb 16, 2015
8b2f983

WIP amd module implementation.

Feb 22, 2015
76f5a02

Fixed moduels being overwritten.

Feb 23, 2015
fdfef6a

Implemented ordering of out put by dependency.

Feb 26, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 25 additions & 1 deletion
src/FunScript.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.30324.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript", "main\FunScript\FunScript.fsproj", "{E0916E67-D3B0-4C3A-AD18-4146882FCEDD}"
EndProject
Expand All@@ -13,6 +13,14 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Interop", "main\F
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Rx", "extra\FunScript.Rx\FunScript.Rx.fsproj", "{3D25CAB2-83A4-4D3B-9986-AC068FE29307}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Compiler", "extra\FunScript.Compiler\FunScript.Compiler.fsproj", "{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CompileTestData", "CompileTestData", "{71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Simple", "compileTestData\simple\Simple.fsproj", "{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WithBindings", "compileTestData\WithBindings\WithBindings.fsproj", "{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand All@@ -39,10 +47,26 @@ Global
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.Build.0 = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.Build.0 = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.Build.0 = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
	EndGlobalSection
	GlobalSection(NestedProjects) = preSolution
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
	EndGlobalSection
	GlobalSection(MonoDevelopProperties) = preSolution
 $0.TextStylePolicy = $2
 $1.inheritsSet = null
Expand Down

14 changes: 14 additions & 0 deletions
src/compileTestData/Simple/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

18 changes: 18 additions & 0 deletions
src/compileTestData/Simple/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
[<ReflectedDefinition>]
module Page

module x = 
 let makeHello who = 
 sprintf "hello %s" who

module y = 
 let yMakeHello who = 
 x.makeHello who
 module z =
 let zMakeHello who = 
 x.makeHello who

[<FunScript.AssemblyMain>]
let main() = 
 let hello = y.z.zMakeHello "world"
 hello

88 changes: 88 additions & 0 deletions
src/compileTestData/Simple/Simple.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>e8eda6fd-20d3-4849-95da-ed2b0ae0a869</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>Simple</RootNamespace>
 <AssemblyName>Simple</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>Simple</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

14 changes: 14 additions & 0 deletions
src/compileTestData/WithBindings/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

15 changes: 15 additions & 0 deletions
src/compileTestData/WithBindings/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
[<ReflectedDefinition>]
module Page

open FunScript
open FunScript.TypeScript

let hello () =
 Globals.window.alert("Hello world!")

let jq(selector : string) = Globals.Dollar.Invoke selector
let (?) jq name = jq("#" + name)

[<FunScript.AssemblyMain>]
let main() = 
 jq?helloWorld.click(fun _ -> hello() :> obj)

97 changes: 97 additions & 0 deletions
src/compileTestData/WithBindings/WithBindings.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>{5bb88a86-e7de-43ba-b809-a0dddad7f21c}</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>WithBindings</RootNamespace>
 <AssemblyName>WithBindings</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>WithBindings</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="FunScript.TypeScript.Binding.jquery">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.jquery.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.jquery.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="FunScript.TypeScript.Binding.lib">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.lib.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.lib.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 <None Include="packages.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

5 changes: 5 additions & 0 deletions
src/compileTestData/WithBindings/packages.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
 <package id="FunScript.TypeScript.Binding.jquery" version="1.1.0.37" targetFramework="net45" />
 <package id="FunScript.TypeScript.Binding.lib" version="1.1.0.37" targetFramework="net45" />
</packages>

10 changes: 5 additions & 5 deletions
src/extra/FunScript.Compiler/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>

 </dependentAssembly>
 </assemblyBinding>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor to facilitate amd modules.#168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

xavierzwirtz
wants to merge
8
commits into

base:master
Choose a base branch

from

 Open


Refactor to facilitate amd modules.
#168
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1e4fb3

Included FunScript.Compiler in solution.

Feb 13, 2015
c314218

Refactor of argument verification to use more functional techniques.

Feb 13, 2015
308de3c

WIP Compiler upgrade.

Feb 13, 2015
f1102b5

Added CompileAssembly to FunScript.Compiler

Feb 15, 2015
4827b01

Switched FunScript.Compiler to not reference FunScript itself. Instea…

Feb 16, 2015
8b2f983

WIP amd module implementation.

Feb 22, 2015
76f5a02

Fixed moduels being overwritten.

Feb 23, 2015
fdfef6a

Implemented ordering of out put by dependency.

Feb 26, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 25 additions & 1 deletion
src/FunScript.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.30324.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript", "main\FunScript\FunScript.fsproj", "{E0916E67-D3B0-4C3A-AD18-4146882FCEDD}"
EndProject
Expand All@@ -13,6 +13,14 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Interop", "main\F
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Rx", "extra\FunScript.Rx\FunScript.Rx.fsproj", "{3D25CAB2-83A4-4D3B-9986-AC068FE29307}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Compiler", "extra\FunScript.Compiler\FunScript.Compiler.fsproj", "{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CompileTestData", "CompileTestData", "{71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Simple", "compileTestData\simple\Simple.fsproj", "{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WithBindings", "compileTestData\WithBindings\WithBindings.fsproj", "{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand All@@ -39,10 +47,26 @@ Global
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.Build.0 = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.Build.0 = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.Build.0 = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
	EndGlobalSection
	GlobalSection(NestedProjects) = preSolution
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
	EndGlobalSection
	GlobalSection(MonoDevelopProperties) = preSolution
 $0.TextStylePolicy = $2
 $1.inheritsSet = null
Expand Down

14 changes: 14 additions & 0 deletions
src/compileTestData/Simple/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

18 changes: 18 additions & 0 deletions
src/compileTestData/Simple/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
[<ReflectedDefinition>]
module Page

module x = 
 let makeHello who = 
 sprintf "hello %s" who

module y = 
 let yMakeHello who = 
 x.makeHello who
 module z =
 let zMakeHello who = 
 x.makeHello who

[<FunScript.AssemblyMain>]
let main() = 
 let hello = y.z.zMakeHello "world"
 hello

88 changes: 88 additions & 0 deletions
src/compileTestData/Simple/Simple.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>e8eda6fd-20d3-4849-95da-ed2b0ae0a869</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>Simple</RootNamespace>
 <AssemblyName>Simple</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>Simple</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

14 changes: 14 additions & 0 deletions
src/compileTestData/WithBindings/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

15 changes: 15 additions & 0 deletions
src/compileTestData/WithBindings/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
[<ReflectedDefinition>]
module Page

open FunScript
open FunScript.TypeScript

let hello () =
 Globals.window.alert("Hello world!")

let jq(selector : string) = Globals.Dollar.Invoke selector
let (?) jq name = jq("#" + name)

[<FunScript.AssemblyMain>]
let main() = 
 jq?helloWorld.click(fun _ -> hello() :> obj)

97 changes: 97 additions & 0 deletions
src/compileTestData/WithBindings/WithBindings.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>{5bb88a86-e7de-43ba-b809-a0dddad7f21c}</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>WithBindings</RootNamespace>
 <AssemblyName>WithBindings</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>WithBindings</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="FunScript.TypeScript.Binding.jquery">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.jquery.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.jquery.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="FunScript.TypeScript.Binding.lib">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.lib.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.lib.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 <None Include="packages.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

5 changes: 5 additions & 0 deletions
src/compileTestData/WithBindings/packages.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
 <package id="FunScript.TypeScript.Binding.jquery" version="1.1.0.37" targetFramework="net45" />
 <package id="FunScript.TypeScript.Binding.lib" version="1.1.0.37" targetFramework="net45" />
</packages>

10 changes: 5 additions & 5 deletions
src/extra/FunScript.Compiler/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>

 </dependentAssembly>
 </assemblyBinding>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor to facilitate amd modules.#168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

xavierzwirtz
wants to merge
8
commits into

base:master
Choose a base branch

from

 Open


Refactor to facilitate amd modules.
#168
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1e4fb3

Included FunScript.Compiler in solution.

Feb 13, 2015
c314218

Refactor of argument verification to use more functional techniques.

Feb 13, 2015
308de3c

WIP Compiler upgrade.

Feb 13, 2015
f1102b5

Added CompileAssembly to FunScript.Compiler

Feb 15, 2015
4827b01

Switched FunScript.Compiler to not reference FunScript itself. Instea…

Feb 16, 2015
8b2f983

WIP amd module implementation.

Feb 22, 2015
76f5a02

Fixed moduels being overwritten.

Feb 23, 2015
fdfef6a

Implemented ordering of out put by dependency.

Feb 26, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 25 additions & 1 deletion
src/FunScript.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.30324.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript", "main\FunScript\FunScript.fsproj", "{E0916E67-D3B0-4C3A-AD18-4146882FCEDD}"
EndProject
Expand All@@ -13,6 +13,14 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Interop", "main\F
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Rx", "extra\FunScript.Rx\FunScript.Rx.fsproj", "{3D25CAB2-83A4-4D3B-9986-AC068FE29307}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Compiler", "extra\FunScript.Compiler\FunScript.Compiler.fsproj", "{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CompileTestData", "CompileTestData", "{71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Simple", "compileTestData\simple\Simple.fsproj", "{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WithBindings", "compileTestData\WithBindings\WithBindings.fsproj", "{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand All@@ -39,10 +47,26 @@ Global
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.Build.0 = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.Build.0 = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.Build.0 = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
	EndGlobalSection
	GlobalSection(NestedProjects) = preSolution
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
	EndGlobalSection
	GlobalSection(MonoDevelopProperties) = preSolution
 $0.TextStylePolicy = $2
 $1.inheritsSet = null
Expand Down

14 changes: 14 additions & 0 deletions
src/compileTestData/Simple/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

18 changes: 18 additions & 0 deletions
src/compileTestData/Simple/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
[<ReflectedDefinition>]
module Page

module x = 
 let makeHello who = 
 sprintf "hello %s" who

module y = 
 let yMakeHello who = 
 x.makeHello who
 module z =
 let zMakeHello who = 
 x.makeHello who

[<FunScript.AssemblyMain>]
let main() = 
 let hello = y.z.zMakeHello "world"
 hello

88 changes: 88 additions & 0 deletions
src/compileTestData/Simple/Simple.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>e8eda6fd-20d3-4849-95da-ed2b0ae0a869</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>Simple</RootNamespace>
 <AssemblyName>Simple</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>Simple</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

14 changes: 14 additions & 0 deletions
src/compileTestData/WithBindings/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

15 changes: 15 additions & 0 deletions
src/compileTestData/WithBindings/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
[<ReflectedDefinition>]
module Page

open FunScript
open FunScript.TypeScript

let hello () =
 Globals.window.alert("Hello world!")

let jq(selector : string) = Globals.Dollar.Invoke selector
let (?) jq name = jq("#" + name)

[<FunScript.AssemblyMain>]
let main() = 
 jq?helloWorld.click(fun _ -> hello() :> obj)

97 changes: 97 additions & 0 deletions
src/compileTestData/WithBindings/WithBindings.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>{5bb88a86-e7de-43ba-b809-a0dddad7f21c}</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>WithBindings</RootNamespace>
 <AssemblyName>WithBindings</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>WithBindings</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="FunScript.TypeScript.Binding.jquery">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.jquery.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.jquery.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="FunScript.TypeScript.Binding.lib">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.lib.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.lib.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 <None Include="packages.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

5 changes: 5 additions & 0 deletions
src/compileTestData/WithBindings/packages.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
 <package id="FunScript.TypeScript.Binding.jquery" version="1.1.0.37" targetFramework="net45" />
 <package id="FunScript.TypeScript.Binding.lib" version="1.1.0.37" targetFramework="net45" />
</packages>

10 changes: 5 additions & 5 deletions
src/extra/FunScript.Compiler/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>

 </dependentAssembly>
 </assemblyBinding>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Refactor to facilitate amd modules.#168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

xavierzwirtz
wants to merge
8
commits into

base:master
Choose a base branch

from

 Open


Refactor to facilitate amd modules.
#168
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f1e4fb3

Included FunScript.Compiler in solution.

Feb 13, 2015
c314218

Refactor of argument verification to use more functional techniques.

Feb 13, 2015
308de3c

WIP Compiler upgrade.

Feb 13, 2015
f1102b5

Added CompileAssembly to FunScript.Compiler

Feb 15, 2015
4827b01

Switched FunScript.Compiler to not reference FunScript itself. Instea…

Feb 16, 2015
8b2f983

WIP amd module implementation.

Feb 22, 2015
76f5a02

Fixed moduels being overwritten.

Feb 23, 2015
fdfef6a

Implemented ordering of out put by dependency.

Feb 26, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


26 changes: 25 additions & 1 deletion
src/FunScript.sln

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.30324.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript", "main\FunScript\FunScript.fsproj", "{E0916E67-D3B0-4C3A-AD18-4146882FCEDD}"
EndProject
Expand All@@ -13,6 +13,14 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Interop", "main\F
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Rx", "extra\FunScript.Rx\FunScript.Rx.fsproj", "{3D25CAB2-83A4-4D3B-9986-AC068FE29307}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunScript.Compiler", "extra\FunScript.Compiler\FunScript.Compiler.fsproj", "{4AAD0F56-AF0F-46BD-811E-FEC88EBED669}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CompileTestData", "CompileTestData", "{71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Simple", "compileTestData\simple\Simple.fsproj", "{E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "WithBindings", "compileTestData\WithBindings\WithBindings.fsproj", "{5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}"
EndProject
Global
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
Expand All@@ -39,10 +47,26 @@ Global
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {3D25CAB2-83A4-4D3B-9986-AC068FE29307}.Release|Any CPU.Build.0 = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {4AAD0F56-AF0F-46BD-811E-FEC88EBED669}.Release|Any CPU.Build.0 = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869}.Release|Any CPU.Build.0 = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C}.Release|Any CPU.Build.0 = Release|Any CPU
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
 HideSolutionNode = FALSE
	EndGlobalSection
	GlobalSection(NestedProjects) = preSolution
 {E8EDA6FD-20D3-4849-95DA-ED2B0AE0A869} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
 {5BB88A86-E7DE-43BA-B809-A0DDDAD7F21C} = {71F5249A-EDF9-4C57-B3B8-3CEE26F8A9A6}
	EndGlobalSection
	GlobalSection(MonoDevelopProperties) = preSolution
 $0.TextStylePolicy = $2
 $1.inheritsSet = null
Expand Down

14 changes: 14 additions & 0 deletions
src/compileTestData/Simple/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

18 changes: 18 additions & 0 deletions
src/compileTestData/Simple/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
[<ReflectedDefinition>]
module Page

module x = 
 let makeHello who = 
 sprintf "hello %s" who

module y = 
 let yMakeHello who = 
 x.makeHello who
 module z =
 let zMakeHello who = 
 x.makeHello who

[<FunScript.AssemblyMain>]
let main() = 
 let hello = y.z.zMakeHello "world"
 hello

88 changes: 88 additions & 0 deletions
src/compileTestData/Simple/Simple.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>e8eda6fd-20d3-4849-95da-ed2b0ae0a869</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>Simple</RootNamespace>
 <AssemblyName>Simple</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>Simple</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\Simple.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

14 changes: 14 additions & 0 deletions
src/compileTestData/WithBindings/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
</configuration>

15 changes: 15 additions & 0 deletions
src/compileTestData/WithBindings/Program.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
[<ReflectedDefinition>]
module Page

open FunScript
open FunScript.TypeScript

let hello () =
 Globals.window.alert("Hello world!")

let jq(selector : string) = Globals.Dollar.Invoke selector
let (?) jq name = jq("#" + name)

[<FunScript.AssemblyMain>]
let main() = 
 jq?helloWorld.click(fun _ -> hello() :> obj)

97 changes: 97 additions & 0 deletions
src/compileTestData/WithBindings/WithBindings.fsproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 <PropertyGroup>
 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
 <SchemaVersion>2.0</SchemaVersion>
 <ProjectGuid>{5bb88a86-e7de-43ba-b809-a0dddad7f21c}</ProjectGuid>
 <OutputType>Library</OutputType>
 <RootNamespace>WithBindings</RootNamespace>
 <AssemblyName>WithBindings</AssemblyName>
 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
 <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
 <TargetFSharpCoreVersion>4.3.1.0</TargetFSharpCoreVersion>
 <Name>WithBindings</Name>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
 <DebugSymbols>true</DebugSymbols>
 <DebugType>full</DebugType>
 <Optimize>false</Optimize>
 <Tailcalls>false</Tailcalls>
 <OutputPath>bin\Debug\</OutputPath>
 <DefineConstants>DEBUG;TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Debug\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 <DebugType>pdbonly</DebugType>
 <Optimize>true</Optimize>
 <Tailcalls>true</Tailcalls>
 <OutputPath>bin\Release\</OutputPath>
 <DefineConstants>TRACE</DefineConstants>
 <WarningLevel>3</WarningLevel>
 <PlatformTarget>AnyCPU</PlatformTarget>
 <DocumentationFile>bin\Release\WithBindings.XML</DocumentationFile>
 <Prefer32Bit>true</Prefer32Bit>
 </PropertyGroup>
 <ItemGroup>
 <Reference Include="FunScript.TypeScript.Binding.jquery">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.jquery.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.jquery.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="FunScript.TypeScript.Binding.lib">
 <HintPath>..\..\packages\FunScript.TypeScript.Binding.lib.1.1.0.37\lib\net40\FunScript.TypeScript.Binding.lib.dll</HintPath>
 <Private>True</Private>
 </Reference>
 <Reference Include="mscorlib" />
 <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
 <Private>True</Private>
 </Reference>
 <Reference Include="System" />
 <Reference Include="System.Core" />
 <Reference Include="System.Numerics" />
 </ItemGroup>
 <ItemGroup>
 <Compile Include="Program.fs" />
 <None Include="App.config" />
 <None Include="packages.config" />
 </ItemGroup>
 <ItemGroup>
 <ProjectReference Include="..\..\extra\FunScript.TypeScript\FunScript.TypeScript.fsproj">
 <Name>FunScript.TypeScript</Name>
 <Project>{164139cf-07d4-468f-b6a8-9b92504c38e4}</Project>
 <Private>True</Private>
 </ProjectReference>
 <ProjectReference Include="..\..\main\FunScript\FunScript.fsproj">
 <Name>FunScript</Name>
 <Project>{e0916e67-d3b0-4c3a-ad18-4146882fcedd}</Project>
 <Private>True</Private>
 </ProjectReference>
 </ItemGroup>
 <PropertyGroup>
 <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
 </PropertyGroup>
 <Choose>
 <When Condition="'$(VisualStudioVersion)' == '11.0'">
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </When>
 <Otherwise>
 <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
 <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
 </PropertyGroup>
 </Otherwise>
 </Choose>
 <Import Project="$(FSharpTargetsPath)" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
 Other similar extension points exist, see Microsoft.Common.targets.
 <Target Name="BeforeBuild">
 </Target>
 <Target Name="AfterBuild">
 </Target>
 -->
</Project>

5 changes: 5 additions & 0 deletions
src/compileTestData/WithBindings/packages.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
 <package id="FunScript.TypeScript.Binding.jquery" version="1.1.0.37" targetFramework="net45" />
 <package id="FunScript.TypeScript.Binding.lib" version="1.1.0.37" targetFramework="net45" />
</packages>

10 changes: 5 additions & 5 deletions
src/extra/FunScript.Compiler/App.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
 <startup> 
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
 </startup>
 <runtime>
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.3.0.0"/>
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.3.0.0"/>

 </dependentAssembly>
 </assemblyBinding>
Expand Down
Loading